@@ -19,28 +19,28 @@
 ;;======================================================================
 ;; launch a task - this runs on the originating host, tests themselves
 ;;
 ;;======================================================================
 
-(use regex regex-case base64 sqlite3 srfi-18 directory-utils posix-extras z3
-     call-with-environment-variables csv)
-(use typed-records pathname-expand matchable)
-
-(import (prefix base64 base64:))
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit launch))
-(declare (uses subrun))
-(declare (uses common))
-(declare (uses configf))
-(declare (uses db))
-(declare (uses ezsteps))
-
-(include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
-(include "megatest-fossil-hash.scm")
+;; (use regex regex-case base64 sqlite3 srfi-18 directory-utils posix-extras z3
+;;      call-with-environment-variables csv)
+;; (use typed-records pathname-expand matchable)
+;; 
+;; (import (prefix base64 base64:))
+;; (import (prefix sqlite3 sqlite3:))
+;; 
+;; (declare (unit launch))
+;; (declare (uses subrun))
+;; (declare (uses common))
+;; (declare (uses configf))
+;; (declare (uses db))
+;; (declare (uses ezsteps))
+;; 
+;; (include "common_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
+;; (include "megatest-fossil-hash.scm")
 
 ;;======================================================================
 ;; ezsteps
 ;;======================================================================
 
@@ -307,11 +307,11 @@
 	      ;; no point in sticking around. Exit now. But run end of run before exiting?
         (launch:end-of-run-check run-id)
 	      (exit)))
 	(if (hash-table-ref/default misc-flags 'keep-going #f)
 	    (begin
-	      (thread-sleep! 3) ;; (+ 3 (random 6))) ;; add some jitter to the call home time to spread out the db accesses
+	      (thread-sleep! 3) ;; (+ 3 (pseudo-random-integer 6))) ;; add some jitter to the call home time to spread out the db accesses
 	      (if (hash-table-ref/default misc-flags 'keep-going #f)  ;; keep originals for cpu-load and disk-free unless they change more than the allowed delta
 		  (loop (calc-minutes)
                         (or new-cpu-load cpu-load)
                         (or new-disk-free disk-free)
                         (if do-sync (current-seconds) last-sync)))))))
@@ -357,11 +357,11 @@
                                   #f
                                   (if (substring-index "/" runscript)
                                       runscript ;; use unadultered if contains slashes
                                       (let ((fulln (conc work-area "/" runscript)))
 	                                  (if (and (common:file-exists? fulln)
-                                                   (file-execute-access? fulln))
+                                                   (file-executable? fulln))
                                               fulln
                                               runscript))))) ;; assume it is on the path
                (check-work-area           (lambda ()
                                             ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
                                             (let loop ((count 0))
@@ -614,11 +614,11 @@
 
 	  (if (args:get-arg "-xterm")
 	      (set! fullrunscript "xterm")
 	      (if (and fullrunscript 
 		       (common:file-exists? fullrunscript)
-		       (not (file-execute-access? fullrunscript)))
+		       (not (file-executable? fullrunscript)))
 		  (system (conc "chmod ug+x " fullrunscript))))
 
 	  ;; We are about to actually kick off the test
 	  ;; so this is a good place to remove the records for 
 	  ;; any previous runs
@@ -628,11 +628,11 @@
 		 (tconfig-tmpfile (conc tconfig-fname ".tmp"))
 		 (tconfig         (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t)) ;; 'return-procs)))
 		 (scripts (configf:get-section tconfig "scripts")))
 	    ;; create .testconfig file
 	    (configf:write-alist tconfig tconfig-tmpfile)
-	    (file-move tconfig-tmpfile tconfig-fname #t)
+	    (move-file tconfig-tmpfile tconfig-fname #t)
 	    (delete-file* ".final-status")
 
 	    ;; extract scripts from testconfig and write them to files in test run dir
 	    (for-each
 	     (lambda (scriptdat)
@@ -913,11 +913,11 @@
 			     #f
 			     (car cachefiles))) ;; (and cachedir (conc cachedir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
 	     (rccachef   (if (null? cachefiles)
 			     #f
 			     (cdr cachefiles)))) ;; (and cachedir (conc cachedir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
-	      ;; (cancreate (and cachedir (common:file-exists? cachedir)(file-write-access? cachedir) (not (common:in-running-test?)))))
+	      ;; (cancreate (and cachedir (common:file-exists? cachedir)(file-writable? cachedir) (not (common:in-running-test?)))))
 	(set! *toppath* toppath) ;; This is needed when we are running as a test using CMDINFO as a datasource
         ;;(BB> "launch:setup-body -- cachefiles="cachefiles)
 	(cond
 	 ;; if mtcachef exists just read it, however we need to assume toppath is available in $MT_RUN_AREA_HOME
 	 ((and (not force-reread)
@@ -1094,11 +1094,11 @@
               (set! *configstatus* 'fulldata)))
 
 	;; if have -append-config then read and append here
 	(let ((cfname (args:get-arg "-append-config")))
 	  (if (and cfname
-		   (file-read-access? cfname))
+		   (file-readable? cfname))
 	      (read-config cfname *configdat* #t))) ;; values are added to the hash, no need to do anything special.
 	*toppath*)))
 
 
 (define (get-best-disk confdat testconfig)