Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -3883,11 +3883,17 @@
 						  #f           ;; sort order
 						  'shortlist   ;; query type
 						  0            ;; last update, beginning of time ....
 						  #f           ;; mode
 						  )))
-	 (map db:test-get-testname running-tests))
+	;;(map (lambda (testdat)
+	;;	(if (equal? (db:test-get-item-path testdat) "")
+	;;	    (db:test-get-testname testdat)
+	;;	    (conc (db:test-get-testname testdat)
+	;;		  "/"
+	;;		  (db:test-get-item-path testdat))))
+	 running-tests) ;; calling functions want the entire data
        '())
    (if (or (not waitons)
 	   (null? waitons))
        '()
        (let* ((unmet-pre-reqs '())
@@ -3942,11 +3948,11 @@
 		     (set! item-waiton-met #t)))))
 	       tests)
 	      ;; both requirements, parent and item-waiton must be met to NOT add item to
 	      ;; prereq's not met list
 	      (if (not (or parent-waiton-met item-waiton-met))
-		  (set! result (append (if (null? tests) (list waitontest-name) tests) result)))
+		  (set! result (append (if (null? tests) (list waitontest-name) tests) result))) ;; appends the string if the full record is not available
 	      ;; if the test is not found then clearly the waiton is not met...
 	      ;; (if (not ever-seen)(set! result (cons waitontest-name result)))))
 	      (if (not ever-seen)
 		  (set! result (append (if (null? tests)(list waitontest-name) tests) result)))))
 	  waitons)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -670,11 +670,11 @@
 
      ((and (not (null? fails))(member 'toplevel testmode))
       (if (or (not (null? reg))(not (null? tal)))
 	   (list (car newtal)(append (cdr newtal) reg) '() reruns)
 	  #f)) 
-     ((null? runnables) #f) ;; if we get here and non-completed is null the it's all over.
+     ((null? runnables) #f) ;; if we get here and non-completed is null then it is all over.
      (else
       (debug:print 0 *default-log-port* "WARNING: FAILS or incomplete tests maybe preventing completion of this run. Watch for issues with test " hed ", continuing for now")
       ;; (list (runs:queue-next-hed tal reg reglen regfull)
       ;;   	(runs:queue-next-tal tal reg reglen regfull)
       ;;   	(runs:queue-next-reg tal reg reglen regfull)
@@ -845,11 +845,12 @@
      ;; This is the final stage, everything is in place so launch the test
      ;;
      ((and have-resources
 	   (or (null? prereqs-not-met)
 	       (and (member 'toplevel testmode) ;;  'toplevel)
-		    (null? non-completed))))
+		    (null? non-completed)
+		    (not (member 'exclusive testmode)))))
       ;; (hash-table-delete! *max-tries-hash* (db:test-make-full-name test-name item-path))
       ;; we are going to reset all the counters for test retries by setting a new hash table
       ;; this means they will increment only when nothing can be run
       (set! *max-tries-hash* (make-hash-table))
       ;; well, first lets see if cpu load throttling is enabled. If so wait around until the
@@ -1405,11 +1406,12 @@
   (filter 
    (lambda (t)
      (or (not (vector? t))
 	 (and (equal? "NOT_STARTED" (db:test-get-state t))
 	      (member (db:test-get-status t)
-			      '("n/a" "KEEP_TRYING")))))
+		      '("n/a" "KEEP_TRYING")))
+	 (and (equal? "RUNNING" (db:test-get-state t))))) ;; account for a test that is running
    prereqs-not-met))
 
 (define (runs:pretty-string lst)
   (map (lambda (t)
 	 (if (not (vector? t))