@@ -30,46 +30,42 @@
 ;;
 (use sparse-vectors)
 
 (require-library mutils)
 
-(declare (uses commonmod))
-(import commonmod)
-(declare (uses rmtmod))
-(import rmtmod)
-(declare (uses dbmod))
-(import dbmod)
-(declare (uses runsmod))
-(import runsmod)
-(declare (uses megamod))
-(import megamod)
 (declare (uses mtargs))
 (import (prefix mtargs args:))
 (declare (uses mtconfigf))
 (import (prefix mtconfigf configf:))
 (declare (uses ducttape-lib))
 (import ducttape-lib)
-
 ;; invoke the imports
-(declare (uses commonmod.import))
-(declare (uses rmtmod.import))
-(declare (uses runsmod.import))
-(declare (uses megamod.import))
 (declare (uses mtargs.import))
 (declare (uses mtconfigf.import))
 (declare (uses ducttape-lib.import))
+(declare (uses commonmod))
+(import commonmod)
 
+(declare (uses rmtmod))
+(import rmtmod)
+(declare (uses dbmod))
+(import dbmod)
+(declare (uses runsmod))
+(import runsmod)
+(declare (uses testsmod))
+(import testsmod)
+(declare (uses megamod))
+(import megamod)
+
+;; invoke the imports
+(declare (uses commonmod.import))
+(declare (uses testsmod.import))
+(declare (uses rmtmod.import))
+(declare (uses runsmod.import))
+(declare (uses megamod.import))
 (configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)
 
-;; (declare (uses tdb))
-;; (declare (uses mt))
-;; (declare (uses api))
-;; (declare (uses tasks)) ;; only used for debugging.
-;; (declare (uses env))
-;; (declare (uses diff-report))
-;; (declare (uses ftail))
-;; (import ftail)
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 (define *default-log-port* (current-error-port))
 
 (include "common_records.scm")
@@ -77,11 +73,11 @@
 (include "db_records.scm")
 (include "run_records.scm")
 ;; (include "megatest-fossil-hash.scm") ;; included in megamod
 
 (define getenv get-environment-variable)
-(configf:add-eval-string "(import megamod)(import commonmod)")
+(configf:add-eval-string "(import megamod commonmod (prefix mtconfigf configf:)(prefix mtargs args:))")
 
 (define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
 (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
 
 ;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file