6 files changed, 9 insertions, 8 deletions

diff --git a/tests/Network/BitTorrent/DHT/MessageSpec.hs b/tests/Network/BitTorrent/DHT/MessageSpec.hs
index 4ec875dd..ab6e1ea5 100644
--- a/tests/Network/BitTorrent/DHT/MessageSpec.hs
+++ b/tests/Network/BitTorrent/DHT/MessageSpec.hs
@@ -8,7 +8,7 @@ import Data.ByteString.Lazy as BL
 import Data.Default
 import Data.List as L
 import Data.Maybe
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.DHT.Message
 import qualified Network.KRPC as KRPC (def)
 import Network.KRPC hiding (def)
@@ -17,9 +17,9 @@ import Test.Hspec
 import Test.QuickCheck
 import System.Timeout
 
+import Data.TorrentSpec                 ()
 import Network.BitTorrent.CoreSpec      ()
 import Network.BitTorrent.DHT.TokenSpec ()
-import Data.Torrent.InfoHashSpec        ()
 
 
 instance MonadLogger IO where
diff --git a/tests/Network/BitTorrent/DHT/QuerySpec.hs b/tests/Network/BitTorrent/DHT/QuerySpec.hs
index d25bd120..81c3b45b 100644
--- a/tests/Network/BitTorrent/DHT/QuerySpec.hs
+++ b/tests/Network/BitTorrent/DHT/QuerySpec.hs
@@ -9,7 +9,7 @@ import Data.Default
 import Data.List as L
 import Test.Hspec
 
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.DHT
 import Network.BitTorrent.DHT.Session
 import Network.BitTorrent.DHT.Query
diff --git a/tests/Network/BitTorrent/DHT/RoutingSpec.hs b/tests/Network/BitTorrent/DHT/RoutingSpec.hs
index c4a33357..aeccff5f 100644
--- a/tests/Network/BitTorrent/DHT/RoutingSpec.hs
+++ b/tests/Network/BitTorrent/DHT/RoutingSpec.hs
@@ -8,7 +8,7 @@ import Data.Maybe
 import Test.Hspec
 import Test.QuickCheck
 
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.DHT.Routing as T
 
 import Network.BitTorrent.CoreSpec hiding (spec)
diff --git a/tests/Network/BitTorrent/DHT/SessionSpec.hs b/tests/Network/BitTorrent/DHT/SessionSpec.hs
index bb32cf0e..a5376c32 100644
--- a/tests/Network/BitTorrent/DHT/SessionSpec.hs
+++ b/tests/Network/BitTorrent/DHT/SessionSpec.hs
@@ -5,17 +5,18 @@ import Control.Concurrent
 import Control.Exception
 import Control.Monad.Reader
 import Control.Monad.Trans.Resource
+import Data.Conduit.Lazy
 import Data.Default
 import Data.List as L
 import Test.Hspec
 import Test.QuickCheck
 
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.DHT
 import Network.BitTorrent.DHT.Message
 import Network.BitTorrent.DHT.Session
 
-import Data.Torrent.InfoHashSpec ()
+import Data.TorrentSpec ()
 import Network.BitTorrent.CoreSpec ()
 import Network.BitTorrent.DHT.TokenSpec ()
 
diff --git a/tests/Network/BitTorrent/DHT/TestData.hs b/tests/Network/BitTorrent/DHT/TestData.hs
index 2e000a77..e9473cbb 100644
--- a/tests/Network/BitTorrent/DHT/TestData.hs
+++ b/tests/Network/BitTorrent/DHT/TestData.hs
@@ -3,7 +3,7 @@ module Network.BitTorrent.DHT.TestData
        , testTorrents
        ) where
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 
 data TestEntry = TestEntry
   { entryName  :: String
diff --git a/tests/Network/BitTorrent/DHT/TokenSpec.hs b/tests/Network/BitTorrent/DHT/TokenSpec.hs
index 6353a24c..a45d2212 100644
--- a/tests/Network/BitTorrent/DHT/TokenSpec.hs
+++ b/tests/Network/BitTorrent/DHT/TokenSpec.hs
@@ -7,7 +7,7 @@ import Data.String
 import Test.Hspec
 import Test.QuickCheck
 
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.CoreSpec ()
 import Network.BitTorrent.DHT.Token as T