1 files changed, 14 insertions, 40 deletions

diff --git a/krpc.cabal b/krpc.cabal
index fb7b01fe..c4c0ae10 100644
--- a/krpc.cabal
+++ b/krpc.cabal
@@ -64,8 +64,13 @@ test-suite spec
   default-language:    Haskell2010
   hs-source-dirs:      tests
   main-is:             Spec.hs
+  other-modules:       Network.KRPCSpec
+                       Network.KRPC.MethodSpec
+                       Network.KRPC.MessageSpec
   build-depends:       base        == 4.*
                      , bytestring
+                     , network
+                     , mtl
 
                      , hspec
                      , QuickCheck
@@ -74,55 +79,24 @@ test-suite spec
                      , bencoding
                      , krpc
 
---test-suite test-client
---  type:                exitcode-stdio-1.0
---  default-language:    Haskell2010
---  hs-source-dirs:      tests
---  main-is:             Client.hs
---  other-modules:       Shared
---  build-depends:       base        == 4.*
---                     , bytestring
---                     , process
---                     , filepath
---
---                     , bencoding
---                     , krpc
---                     , network
---
---                     , HUnit
---                     , test-framework
---                     , test-framework-hunit
-
-
---executable test-server
+--executable bench-server
 --  default-language:    Haskell2010
---  hs-source-dirs:      tests
+--  hs-source-dirs:      bench
 --  main-is:             Server.hs
---  other-modules:       Shared
 --  build-depends:       base        == 4.*
 --                     , bytestring
---                     , bencoding
 --                     , krpc
 --                     , network
+--  ghc-options:         -fforce-recomp
 
---executable bench-server
+--benchmark bench-client
+--  type:                exitcode-stdio-1.0
 --  default-language:    Haskell2010
 --  hs-source-dirs:      bench
---  main-is:             Server.hs
---  build-depends:       base        == 4.*
+--  main-is:             Main.hs
+--  build-depends:       base == 4.*
 --                     , bytestring
+--                     , criterion
 --                     , krpc
 --                     , network
---  ghc-options:         -fforce-recomp
-
-benchmark bench-client
-  type:                exitcode-stdio-1.0
-  default-language:    Haskell2010
-  hs-source-dirs:      bench
-  main-is:             Main.hs
-  build-depends:       base == 4.*
-                     , bytestring
-                     , criterion
-                     , krpc
-                     , network
-  ghc-options:         -O2 -fforce-recomp
\ No newline at end of file
+--  ghc-options:         -O2 -fforce-recomp
\ No newline at end of file