Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -361,14 +361,14 @@
 								   (debug:print 0 "Killing " (cadr parts) "; kill -9  " p-id)
 								   ;; (process-signal pid signal/kill))))) ;; 
 								   (system (conc "kill -9 " p-id))))))
 							 (car processes)))
 						      (system (conc "kill -9 -" pid))
-						      (tests:test-set-status! test-id "KILLED"  "FAIL" (args:get-arg "-m") #f)))
+						      (tests:test-set-status! test-id "KILLED"  "KILLED" (args:get-arg "-m") #f)))
 						   (begin
 						     (debug:print 0 "WARNING: Request received to kill job but problem with process, attempting to kill manager process")
-						     (tests:test-set-status! test-id "KILLED"  "FAIL" (args:get-arg "-m") #f)
+						     (tests:test-set-status! test-id "KILLED"  "KILLED" (args:get-arg "-m") #f)
 						     (sqlite3:finalize! tdb)
 						     (exit 1) ;; IS THIS NECESSARY OR WISE???
 						     )))
 					     (set! kill-tries (+ 1 kill-tries))
 					     (mutex-unlock! m)))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1179,17 +1179,17 @@
 		(if testdat
 		    (string->symbol (test:get-state testdat))
 		    'failed-to-insert))
 	((failed-to-insert)
 	 (debug:print 0 "ERROR: Failed to insert the record into the db"))
-	((NOT_STARTED COMPLETED DELETED)
+	((NOT_STARTED COMPLETED DELETED INCOMPLETE)
 	 (let ((runflag #f))
 	   (cond
 	    ;; -force, run no matter what
 	    (force (set! runflag #t))
 	    ;; NOT_STARTED, run no matter what
-	    ((member (test:get-state testdat) '("DELETED" "NOT_STARTED"))(set! runflag #t))
+	    ((member (test:get-state testdat) '("DELETED" "NOT_STARTED" "INCOMPLETE"))(set! runflag #t))
 	    ;; not -rerun and PASS, WARN or CHECK, do no run
 	    ((and (or (not rerun)
 		      keepgoing)
 		  ;; Require to force re-run for COMPLETED or *anything* + PASS,WARN or CHECK
 		  (or (member (test:get-status testdat) '("PASS" "WARN" "CHECK" "SKIP" "WAIVED"))