diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
index 138d735..ec16582 100644
--- a/src/XMonad/Core.hs
+++ b/src/XMonad/Core.hs
@@ -36,7 +36,7 @@ import XMonad.StackSet hiding (modify)
 import Prelude
 import Control.Exception.Extensible (fromException, try, bracket, throw, finally, SomeException(..))
 import qualified Control.Exception.Extensible as E
-import Control.Applicative
+import Control.Applicative(Applicative, pure, (<$>), (<*>))
 import Control.Monad.State
 import Control.Monad.Reader
 import Data.Default
diff --git a/src/XMonad/Main.hs b/src/XMonad/Main.hs
index 735725c..4aa3592 100644
--- a/src/XMonad/Main.hs
+++ b/src/XMonad/Main.hs
@@ -197,7 +197,6 @@ launch initxmc = do
     hSetBuffering stdout NoBuffering
 
     let layout = layoutHook xmc
-        lreads = readsLayout layout
         initialWinset = let padToLen n xs = take (max n (length xs)) $ xs ++ repeat ""
             in new layout (padToLen (length xinesc) (workspaces xmc)) $ map SD xinesc
 
diff --git a/src/XMonad/Operations.hs b/src/XMonad/Operations.hs
index 7dbb45c..05e100a 100644
--- a/src/XMonad/Operations.hs
+++ b/src/XMonad/Operations.hs
@@ -28,7 +28,7 @@ import Data.Ratio
 import qualified Data.Map as M
 import qualified Data.Set as S
 
-import Control.Applicative
+import Control.Applicative((<$>), (<*>))
 import Control.Arrow (second)
 import Control.Monad.Reader
 import Control.Monad.State
diff --git a/xmonad.cabal b/xmonad.cabal
index dbcdb4a..58fda30 100644
--- a/xmonad.cabal
+++ b/xmonad.cabal
@@ -131,3 +131,20 @@ test-suite properties
                     X11,
                     xmonad
     main-is: Properties.hs
+    other-modules:  Instances
+                    Properties.Delete
+                    Properties.Failure
+                    Properties.Floating
+                    Properties.Focus
+                    Properties.GreedyView
+                    Properties.Insert
+                    Properties.Layout.Full
+                    Properties.Layout.Tall
+                    Properties.Screen
+                    Properties.Shift
+                    Properties.Stack
+                    Properties.StackSet
+                    Properties.Swap
+                    Properties.View
+                    Properties.Workspace
+                    Utils