@@ -33,10 +33,12 @@
 (declare (uses apimod))
 (declare (uses genexample))
 (declare (uses rmtmod))
 (declare (uses archivemod))
 (declare (uses mutils))
+(declare (uses odsmod))
+(declare (uses testsmod))
 
 (use srfi-69)
 
 (module mtbody
 	*
@@ -109,11 +111,10 @@
 	  srfi-69
 	  typed-records
 	  system-information
 
 	  debugprint
-	  mutils
   )))
 
 ;; imports common to chk5 and ck4
 (import srfi-13)
 
@@ -140,10 +141,13 @@
 	launchmod
 	fsmod
 	envmod
 	apimod
 	genexample
+	mutils
+	odsmod
+	testsmod
         )
 
 (include "common_records.scm")
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
@@ -2074,11 +2078,11 @@
       (runs:run-tests target
 		      runname
 		      #f ;; (common:args-get-testpatt #f)
 		      ;; (or (args:get-arg "-testpatt")
 		      ;;     "%")
-		      user
+		      (current-user-name)
 		      args:arg-hash
 		      run-count: rerun-cnt)))
 
   ;; get lock in db for full run for this directory
   ;; for all tests with deps
@@ -2174,19 +2178,19 @@
 
   ;;======================================================================
   ;; Rollup into a run
   ;;======================================================================
 
-  (if (args:get-arg "-rollup")
-      (general-run-call 
-       "-rollup" 
-       "rollup tests" 
-       (lambda (target runname keys keyvals)
-	 (runs:rollup-run keys
-			  keyvals
-			  (or (args:get-arg "-runname")(args:get-arg ":runname") )
-			  user))))
+;;   (if (args:get-arg "-rollup")
+;;       (general-run-call 
+;;        "-rollup" 
+;;        "rollup tests" 
+;;        (lambda (target runname keys keyvals)
+;; 	 (runs:rollup-run keys
+;; 			  keyvals
+;; 			  (or (args:get-arg "-runname")(args:get-arg ":runname") )
+;; 			  user))))
 
   ;;======================================================================
   ;; Lock or unlock a run
   ;;======================================================================