diff --git a/Network/DNS/Resolver.hs b/Network/DNS/Resolver.hs
--- a/Network/DNS/Resolver.hs
+++ b/Network/DNS/Resolver.hs
@@ -177,6 +177,6 @@
     q = makeQuestion dom typ
     check seqno res = do
         let hdr = header res
-        if identifier hdr == seqno && anCount hdr /= 0
+        if identifier hdr == seqno
             then Just res
             else Nothing
diff --git a/Test.hs b/Test.hs
--- a/Test.hs
+++ b/Test.hs
@@ -1,70 +1,64 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings, TemplateHaskell #-}
 
 module Test where
 
+import qualified Data.ByteString.Char8 as BS
 import Data.List
 import Network.DNS as DNS
-import Test.Framework (defaultMain, testGroup, Test)
 import Test.Framework.Providers.HUnit
-import Test.HUnit hiding (Test)
-import qualified Data.ByteString.Char8 as BS
+import Test.Framework.TH.Prime
+import Test.HUnit
 
-tests :: [Test]
-tests = [
-    testGroup "Test case" [
-         testCase "lookupA" test_lookupA
-       , testCase "lookupAAAA" test_lookupAAAA
-       , testCase "lookupTXT" test_lookupTXT
-       , testCase "lookupAviaMX" test_lookupAviaMX
-       , testCase "lookupAviaCNAME" test_lookupAviaCNAME
-       , testCase "lookupPTR" test_lookupPTR
-       , testCase "lookupSRV" test_lookupSRV
-       ]
-  ]
+----------------------------------------------------------------
 
+main :: IO ()
+main = $(defaultMainGenerator)
+
+----------------------------------------------------------------
+
 (?=) :: (Eq a, Show a) => IO a -> a -> IO ()
 a ?= b = a >>= (@?= b)
 
-test_lookupA :: IO ()
-test_lookupA = do
+case_lookupA :: Assertion
+case_lookupA = do
     rs <- makeResolvSeed defaultResolvConf
     withResolver rs $ \resolver ->
         DNS.lookupA resolver "www.mew.org" ?= Just ["202.232.15.101"]
 
-(??=) :: (Ord a, Show a) => IO (Maybe [a]) -> [a] -> IO ()
+(??=) :: (Ord a, Show a) => IO (Maybe [a]) -> [a] -> Assertion
 a ??= bs = do
     mas <- a
     case mas of
         Nothing -> False @? "should be Nothing"
         Just as -> sort as @?= sort bs
 
-test_lookupAAAA :: IO ()
-test_lookupAAAA = do
+case_lookupAAAA :: Assertion
+case_lookupAAAA = do
     rs <- makeResolvSeed defaultResolvConf
     withResolver rs $ \resolver -> do
         DNS.lookupAAAA resolver "mew.org" ?= Nothing
         DNS.lookupAAAA resolver "www.mew.org" ?= Just ["2001:240:11e:c00::101"]
 
-test_lookupTXT :: IO ()
-test_lookupTXT = do
+case_lookupTXT :: Assertion
+case_lookupTXT = do
     rs <- makeResolvSeed defaultResolvConf
     withResolver rs $ \resolver ->
         DNS.lookupTXT resolver "mew.org" ?= Just ["v=spf1 +mx -all"]
 
-test_lookupAviaMX :: IO ()
-test_lookupAviaMX = do
+case_lookupAviaMX :: Assertion
+case_lookupAviaMX = do
     rs <- makeResolvSeed defaultResolvConf
     withResolver rs $ \resolver ->
         DNS.lookupAviaMX resolver "mixi.jp" ??= ["202.32.29.4", "202.32.29.5"]
 
-test_lookupAviaCNAME :: IO ()
-test_lookupAviaCNAME = do
+case_lookupAviaCNAME :: Assertion
+case_lookupAviaCNAME = do
     rs <- makeResolvSeed defaultResolvConf
     withResolver rs $ \resolver ->
         DNS.lookupA resolver "ghs.google.com" ??= ["72.14.203.121"]
 
-test_lookupPTR :: IO ()
-test_lookupPTR = do
+case_lookupPTR :: Assertion
+case_lookupPTR = do
     rs <- makeResolvSeed defaultResolvConf
     withResolver rs $ \resolver ->
         DNS.lookupPTR resolver rev ?= Just ["www-v4.iij.ad.jp."]
@@ -73,11 +67,8 @@
     rev = BS.intercalate "." (reverse (BS.split '.' target))
           `BS.append` ".in-addr.arpa"
 
-test_lookupSRV :: IO ()
-test_lookupSRV = do
+case_lookupSRV :: Assertion
+case_lookupSRV = do
     rs <- makeResolvSeed defaultResolvConf
     withResolver rs $ \resolver ->
         DNS.lookupSRV resolver "_sip._tcp.cisco.com" ?= Just [(1,0,5060,"vcsgw.cisco.com.")]
-
-main :: IO ()
-main = defaultMain tests
diff --git a/dns.cabal b/dns.cabal
--- a/dns.cabal
+++ b/dns.cabal
@@ -1,11 +1,11 @@
 Name:                   dns
-Version:                0.3.2
+Version:                0.3.3
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3
 License-File:           LICENSE
-Synopsis:               DNS libary in Haskell
-Description:            DNS libary for clients and servers.
+Synopsis:               DNS library in Haskell
+Description:            DNS library for clients and servers.
 Category:               Network
 Cabal-Version:          >= 1.6
 Build-Type:             Simple