Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -168,11 +168,11 @@
 
 
 ;; returns waitons waitors tconfigdat
 ;;
 (define (tests:get-waitons test-name all-tests-registry)
-   (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs))) ;; assuming no problems with immediate evaluation, this could be simplified ('return-procs -> #t)
+   (let* ((config  (tests:get-testconfig test-name #f all-tests-registry #t))) ;;'return-procs))) ;; assuming no problems with immediate evaluation, this could be simplified ('return-procs -> #t)
      (let ((instr (if config 
 		      (configf:lookup config "requirements" "waiton")
 		      (begin ;; No config means this is a non-existant test
 			(debug:print-error 0 *default-log-port* "non-existent required test \"" test-name "\"")
 			(exit 1))))
@@ -1579,31 +1579,32 @@
                                                                  test-name "/" item-path))
                                               (local-tcfg (conc local-tcdir "/testconfig")))
                                          (if (common:file-exists? local-tcfg)
                                              local-tcdir
                                              #f))
-				       (conc *toppath* "/tests/" test-name)))
+				       (begin
+					 (debug:print-info 0 *default-log-port* "reading testconfig for "test-full-name" from tests/"test-name" directory.")
+					 (conc *toppath* "/tests/" test-name)) ;; should this fallback exist?
+				       ))
 		     (test-configf (conc test-path "/testconfig"))
 		     (testexists   (let loopa ((tries-left 30))
                                      (cond
-                                      (
-                                       (and (common:file-exists? test-configf)(file-read-access? test-configf))
+                                      ((and (common:file-exists? test-configf)(file-read-access? test-configf))
                                        #t)
-                                      (
-                                       (common:file-exists? test-configf)
+                                      ((common:file-exists? test-configf)
                                        (debug:print 0 *default-log-port* "WARNING: Cannot read testconfig file: "test-configf)
                                        #f)
-                                      (
-                                       (and wait-a-minute (> tries-left 0))
+                                      ((and wait-a-minute (> tries-left 0))
                                        (thread-sleep! 10)
-                                       (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf" will retry in 10 seconds.  Tries left: "tries-left) ;; BB: this fires
+                                       (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf
+						    " will retry in 10 seconds.  Tries left: "tries-left) ;; BB: this fires
                                        (loopa (sub1 tries-left)))
                                       (else
                                        (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf) ;; BB: this fires
                                        #f))))
 		     (tcfg         (if testexists
-				       (read-config test-configf #f system-allowed
+				       (configf:read-file test-configf #f system-allowed
 						    environ-patt: (if system-allowed
 								      "pre-launch-env-vars"
 								      #f))
 				       #f)))
 		(if (and tcfg cache-file) (hash-table-set! tcfg "have fulldata" #t)) ;; mark this as fully read data