4 files changed, 4 insertions, 7 deletions

diff --git a/tests/Data/Torrent/MetainfoSpec.hs b/tests/Data/Torrent/MetainfoSpec.hs
index 537b3f99..1a8f97c7 100644
--- a/tests/Data/Torrent/MetainfoSpec.hs
+++ b/tests/Data/Torrent/MetainfoSpec.hs
@@ -14,7 +14,6 @@ import Test.QuickCheck
 import Test.QuickCheck.Instances ()
 
 import Data.Torrent
-import Data.Torrent.Piece
 import Data.Torrent.LayoutSpec ()
 import Network.BitTorrent.Core.NodeInfoSpec ()
 
diff --git a/tests/Data/Torrent/PieceSpec.hs b/tests/Data/Torrent/PieceSpec.hs
index ef1f2938..d3933396 100644
--- a/tests/Data/Torrent/PieceSpec.hs
+++ b/tests/Data/Torrent/PieceSpec.hs
@@ -3,7 +3,7 @@ module Data.Torrent.PieceSpec (spec) where
 import Control.Applicative
 import Test.Hspec
 import Test.QuickCheck
-import Data.Torrent.Piece
+import Data.Torrent
 
 
 instance Arbitrary a => Arbitrary (Piece a) where
diff --git a/tests/Network/BitTorrent/Exchange/Session/MetadataSpec.hs b/tests/Network/BitTorrent/Exchange/Session/MetadataSpec.hs
index 975ceb5b..5392d74b 100644
--- a/tests/Network/BitTorrent/Exchange/Session/MetadataSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/Session/MetadataSpec.hs
@@ -7,8 +7,7 @@ import Test.Hspec
 import Test.QuickCheck
 
 import Data.BEncode as BE
-import Data.Torrent
-import Data.Torrent.Piece as P
+import Data.Torrent as Torrent
 import Network.BitTorrent.Core
 import Network.BitTorrent.Exchange.Message
 import Network.BitTorrent.Exchange.Session.Metadata
@@ -36,7 +35,7 @@ simulateFetch :: InfoDict -> Updates (Maybe InfoDict)
 simulateFetch dict = go
   where
     blocks = chunkBy metadataPieceSize (BL.toStrict (BE.encode dict))
-    packPiece ix = P.Piece ix (blocks !! ix)
+    packPiece ix = Torrent.Piece ix (blocks !! ix)
     ih     = idInfoHash dict
 
     go = do
diff --git a/tests/System/Torrent/StorageSpec.hs b/tests/System/Torrent/StorageSpec.hs
index ebf4fe3e..96f1b036 100644
--- a/tests/System/Torrent/StorageSpec.hs
+++ b/tests/System/Torrent/StorageSpec.hs
@@ -7,9 +7,8 @@ import System.Directory
 import System.IO.Unsafe
 import Test.Hspec
 
-import Data.Torrent.Bitfield as BF
 import Data.Torrent
-import Data.Torrent.Piece
+import Data.Torrent.Bitfield as BF
 import System.Torrent.Storage