2 files changed, 9 insertions, 12 deletions

diff --git a/tests/Network/BitTorrent/Core/PeerIdSpec.hs b/tests/Network/BitTorrent/Core/PeerIdSpec.hs
index 7153ef68..4e9f1655 100644
--- a/tests/Network/BitTorrent/Core/PeerIdSpec.hs
+++ b/tests/Network/BitTorrent/Core/PeerIdSpec.hs
@@ -1,15 +1,18 @@
 module Network.BitTorrent.Core.PeerIdSpec (spec) where
 import Control.Applicative
+import Data.Text.Encoding as T
 import Test.Hspec
 import Test.QuickCheck
-import Test.QuickCheck.Instances
+import Test.QuickCheck.Instances ()
 import Network.BitTorrent.Core.PeerId
 
 
 instance Arbitrary PeerId where
   arbitrary = oneof
-    [ azureusStyle defaultClientId defaultVersionNumber <$> arbitrary
-    , shadowStyle  'X'             defaultVersionNumber <$> arbitrary
+    [ azureusStyle defaultClientId defaultVersionNumber
+        <$> pure ""
+--    , shadowStyle  'X'             defaultVersionNumber
+--        <$> (T.encodeUtf8 <$> arbitrary)
     ]
 
 spec :: Spec
diff --git a/tests/Network/BitTorrent/Tracker/MessageSpec.hs b/tests/Network/BitTorrent/Tracker/MessageSpec.hs
index 8a06aaba..2a882c5d 100644
--- a/tests/Network/BitTorrent/Tracker/MessageSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/MessageSpec.hs
@@ -44,8 +44,8 @@ instance Arbitrary AnnounceQuery where
 baseURI :: URI
 baseURI = fromJust $ parseURI "http://a"
 
-parseUriQuery :: URI -> [(Text, Text)]
-parseUriQuery = filterMaybes . parseQueryText . BC.pack . uriQuery
+parseUriQuery :: URI -> SimpleQuery
+parseUriQuery = filterMaybes . parseQuery . BC.pack . uriQuery
   where
     filterMaybes :: [(a, Maybe b)] -> [(a, b)]
     filterMaybes = catMaybes . L.map f
@@ -53,16 +53,10 @@ parseUriQuery = filterMaybes . parseQueryText . BC.pack . uriQuery
         f (a, Nothing) = Nothing
         f (a, Just b ) = Just (a, b)
 
-test = do
-  let q = unGen arbitrary (mkStdGen 0) 0
-  print $ renderAnnounceQuery baseURI q
-  print $ parseUriQuery $ renderAnnounceQuery baseURI q
-
 spec :: Spec
 spec = do
   describe "Announce" $ do
-    before test $
-      it "properly url encoded" $ property $ \ q ->
+    it "properly url encoded" $ property $ \ q ->
       parseAnnounceQuery (parseUriQuery (renderAnnounceQuery baseURI q))
         `shouldBe` Right q