@@ -950,17 +950,17 @@
 	 "UPDATE tests 
              SET fail_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND status='FAIL'),
                  pass_count=(SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND (status='PASS' OR status='WARN' OR status='WAIVED'))
              WHERE run_id=? AND testname=? AND item_path='';"
 	 run-id test-name run-id test-name run-id test-name)
-        (thread-sleep! 0.1) ;; give other processes a chance here
-	(if (equal? status "RUNNING") ;; running takes priority over all other states, force the test state to RUNNING
-	    (sqlite3:execute db "UPDATE tests SET state=? WHERE run_id=? AND testname=? AND item_path='';" "RUNNING" run-id test-name)
+        ;; (thread-sleep! 0.1) ;; give other processes a chance here
+	(if (member status '("NOT_STARTED" "LAUNCHED" "RUNNING" "REMOTEHOSTSTART")) ;; running takes priority over all other states, force the test state to RUNNING
+	    (sqlite3:execute db "UPDATE tests SET state=? WHERE run_id=? AND testname=? AND item_path='';" status run-id test-name)
 	    (sqlite3:execute
 	     db
 	     "UPDATE tests
-                       SET state=CASE WHEN (SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND state in ('RUNNING','NOT_STARTED')) > 0 THEN 
+                       SET state=CASE WHEN (SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND state in ('RUNNING','NOT_STARTED','LAUNCHED','REMOTEHOSTSTART')) > 0 THEN 
                           'RUNNING'
                        ELSE 'COMPLETED' END,
                           status=CASE WHEN fail_count > 0 THEN 'FAIL' WHEN pass_count > 0 AND fail_count=0 THEN 'PASS' ELSE 'UNKNOWN' END
                        WHERE run_id=? AND testname=? AND item_path='';"
 	     run-id test-name run-id test-name))
@@ -1075,11 +1075,11 @@
 	  (debug:print 4 lin)
 	  (rdb:csv->test-data db test-id lin)
 	  (loop (read-line)))))
   ;; roll up the current results.
   ;; FIXME: Add the status to 
-  (rdb:test-data-rollup db test-id #f))
+  (db:test-data-rollup db test-id #f))
 
 ;; WARNING: Do NOT call this for the parent test on an iterated test
 ;; Roll up test_data pass/fail results
 ;; look at the test_data status field, 
 ;;    if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS.
@@ -1222,11 +1222,11 @@
 	     (result         '()))
 	(for-each 
 	 (lambda (waitontest-name)
 	   ;; by getting the tests with matching name we are looking only at the matching test 
 	   ;; and related sub items
-	   (let ((tests             (rdb:get-tests-for-run db run-id waitontest-name #f '() '()))
+	   (let ((tests             (open-run-close db:get-tests-for-run db run-id waitontest-name #f '() '()))
 		 (ever-seen         #f)
 		 (parent-waiton-met #f)
 		 (item-waiton-met   #f))
 	     (for-each 
 	      (lambda (test)
@@ -1237,15 +1237,16 @@
 		       (is-completed      (equal? state "COMPLETED"))
 		       (is-ok             (member status '("PASS" "WARN" "CHECK" "WAIVED")))
 		       (same-itempath     (equal? ref-item-path item-path)))
 		  (set! ever-seen #t)
 		  (cond
-		   ;; case 1, non-item (parent test) is 
+		   ;; case 1, non-item (parent test) is completed and ok
 		   ((and (equal? item-path "") ;; this is the parent test
 			 is-completed
 			 (or is-ok (eq? mode 'toplevel)))
 		    (set! parent-waiton-met #t))
+		   ;; 
 		   ((and same-itempath
 			 is-completed
 			 (or is-ok (eq? mode 'toplevel)))
 		    (set! item-waiton-met #t)))))
 	      tests)