@@ -31,12 +31,11 @@
 (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   (cons (conc *toppath* "/tests") ;; the default
-				   (tests:get-tests-search-path *configdat*))))
+  (let* ((test-search-path   (tests:get-tests-search-path *configdat*)))
     (tests:get-valid-tests (make-hash-table) test-search-path)))
 
 (define (tests:get-tests-search-path cfgdat)
   (let ((paths (map cadr (configf:get-section cfgdat "tests-paths"))))
     (cons (conc *toppath* "/tests") paths)))
@@ -474,11 +473,11 @@
 	     #f ;; cannot have a which is waiting on b happening before b
 	     (if (and b-waitons (member (tests:testqueue-get-testname a-record) b-waitons))
 		 #t ;; this is the correct order, b is waiting on a and b is before a
 		 (if (> a-priority b-priority)
 		     #t ;; if a is a higher priority than b then we are good to go
-		     #f))))))))
+		     (string-compare3 a b)))))))))
 
 ;; for each test:
 ;;   
 (define (tests:filter-non-runnable run-id testkeynames testrecordshash)
   (let ((runnables '()))