@@ -15,29 +15,29 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils call-with-environment-variables)
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit mt))
-(declare (uses db))
-(declare (uses common))
-(declare (uses items))
-(declare (uses runconfig))
-(declare (uses tests))
-(declare (uses server))
-(declare (uses runs))
-(declare (uses rmt))
-;; (declare (uses filedb))
-
-(include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
-(include "run_records.scm")
-(include "test_records.scm")
+;; (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils call-with-environment-variables)
+;; (import (prefix sqlite3 sqlite3:))
+;; 
+;; (declare (unit mt))
+;; (declare (uses db))
+;; (declare (uses common))
+;; (declare (uses items))
+;; (declare (uses runconfig))
+;; (declare (uses tests))
+;; (declare (uses server))
+;; (declare (uses runs))
+;; (declare (uses rmt))
+;; ;; (declare (uses filedb))
+;; 
+;; (include "common_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
+;; (include "run_records.scm")
+;; (include "test_records.scm")
 
 ;; This is the Megatest API. All generally "useful" routines will be wrapped or extended
 ;; here.
 
 ;;======================================================================
@@ -155,14 +155,14 @@
 			event-time
 			))
 	 (prev-nbfake-log (get-environment-variable "NBFAKE_LOG")))
     (setenv "NBFAKE_LOG" (conc (cond
 				((and (directory-exists? test-rundir)
-				      (file-write-access? test-rundir))
+				      (file-writable? test-rundir))
 				 test-rundir)
 				((and (directory-exists? *toppath*)
-				      (file-write-access? *toppath*))
+				      (file-writable? *toppath*))
 				 *toppath*)
 				(else (conc "/tmp/" (current-user-name))))
 			       "/" logname))
     (debug:print-info 0 *default-log-port* "TRIGGERED on " trigger ", running command " fullcmd " output at " (get-environment-variable "NBFAKE_LOG"))
     ;; (call-with-environment-variables
@@ -285,11 +285,11 @@
 	  (let loop ((hed (car test-dirs))
 		     (tal (cdr test-dirs)))
 	    ;; Setting MT_LINKTREE here is almost certainly unnecessary. 
 	    (let ((tconfig-file (conc hed "/" test-name "/testconfig")))
 	      (if (and (common:file-exists? tconfig-file)
-		       (file-read-access? tconfig-file))
+		       (file-readable? tconfig-file))
 		  (let ((link-tree-path (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))
 			(old-link-tree  (get-environment-variable "MT_LINKTREE")))
 		    (if link-tree-path (setenv "MT_LINKTREE" link-tree-path))
 		    (let ((newtcfg (read-config tconfig-file #f #f))) ;; NOTE: Does NOT run [system ...]
 		      (hash-table-set! *testconfigs* test-name newtcfg)