diff --git a/Options.hs b/Options.hs
index 019973763..62a94a137 100644
--- a/Options.hs
+++ b/Options.hs
@@ -1,4 +1,4 @@
-module Options
+module Options (parseOptions, parsePatternArgs, wildcard, Flag(..), usage, ledgerFilePath)
 where
 import System.Console.GetOpt
 import System.Directory
diff --git a/hledger.hs b/hledger.hs
index 5981aff27..f75fffac3 100644
--- a/hledger.hs
+++ b/hledger.hs
@@ -47,8 +47,8 @@ import qualified Data.Map as Map (lookup)
 
 import Options
 import Models
-import Parse
-import Tests
+import Parse (parseLedgerAndDo, parseLedgerFile)
+import Tests (hunit, quickcheck)
 import Utils hiding (test)
 
 
@@ -69,8 +69,8 @@ type Command = [Flag] -> (Regex,Regex) -> IO ()
 
 selftest :: Command
 selftest opts pats = do 
-  Tests.hunit
-  Tests.quickcheck
+  hunit
+  quickcheck
   return ()
 
 print_ :: Command