@@ -32,17 +32,17 @@
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
 
 ;; Call this one to do all the work and get a standardized list of tests
-(define (tests:get-all)
-  (let* ((test-search-path   (tests:get-tests-search-path *configdat*)))
+(define (tests:get-all area-dat)
+  (let* ((test-search-path   (tests:get-tests-search-path (megatest:area-configdat area-dat))))
     (tests:get-valid-tests (make-hash-table) test-search-path)))
 
-(define (tests:get-tests-search-path cfgdat)
+(define (tests:get-tests-search-path cfgdat area-dat)
   (let ((paths (map cadr (configf:get-section cfgdat "tests-paths"))))
-    (append paths (list (conc *toppath* "/tests")))))
+    (append paths (list (conc (megatest:area-path area-dat) "/tests")))))
 
 (define (tests:get-valid-tests test-registry tests-paths)
   (if (null? tests-paths) 
       test-registry
       (let loop ((hed (car tests-paths))
@@ -584,12 +584,12 @@
 ;; 	       (tests:match test-patts testname #f))
 ;; 	     (map (lambda (testp)
 ;; 		    (last (string-split testp "/")))
 ;; 		  tests)))))
 
-(define (tests:get-testconfig test-name test-registry system-allowed)
-  (let* ((test-path    (hash-table-ref/default test-registry test-name (conc *toppath* "/tests/" test-name)))
+(define (tests:get-testconfig test-name test-registry system-allowed area-dat)
+  (let* ((test-path    (hash-table-ref/default test-registry test-name (conc (megatest:area-path area-dat) "/tests/" test-name)))
 	 (test-configf (conc test-path "/testconfig"))
 	 (testexists   (and (file-exists? test-configf)(file-read-access? test-configf)))
 	 (tcfg         (if testexists
 			   (read-config test-configf #f system-allowed environ-patt: (if system-allowed
 											 "pre-launch-env-vars"