@@ -759,11 +759,11 @@
             (debug:print 0 *default-log-port* "running cnt > 0 but <= 3 kill-running-tests-if-dead" )
    				  (let ((kill-cnt (launch:kill-tests-if-dead run-id)))
            			(if (and all-test-launched  (equal? all-test-launched "yes") (eq? kill-cnt running-cnt))
            					(launch:end-of-run-check run-id)))) ;;todo
         (else  (debug:print 0 *default-log-port* "Should it get here?? May be everything is not launched yet. Running test cnt:" running-cnt " Not completed test cnt:" not-completed-cnt)
-         (let* ((not-completed-tests (rmt:get-tests-for-run run-id "%" `("NOT_STARTED" "RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
+         (let* ((not-completed-tests (rmt:get-tests-for-run run-id "%" `("NOT_STARTED" "RUNNING" "LAUNCHING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
        (if (> (length not-completed-tests) 0) 
            (let loop ((running-test (car not-completed-tests))
 			     (tal    (cdr not-completed-tests)))
 		       (let* ((test-name (vector-ref running-test 2))
                  (item-path (vector-ref running-test 11)))
@@ -780,11 +780,11 @@
 	   #f
 	   #t))
       #t))
  
 (define (launch:kill-tests-if-dead run-id)
-  (let* ((running-tests (rmt:get-tests-for-run run-id "%" `("RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
+  (let* ((running-tests (rmt:get-tests-for-run run-id "%" `("RUNNING" "LAUNCHING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
        (let loop ((running-test (car running-tests))
 			     (tal    (cdr running-tests))
 			     (kill-cnt 0))
 		       (let* ((test-name (vector-ref running-test 2))
                  (item-path (vector-ref running-test 11))