@@ -2138,14 +2138,16 @@
 				   ;; (rmt:sdb-qry 'getid 
 				   (db:test-get-rundir new-test-dat)) ;; )    ;; run dir is from the link tree
                                   (has-subrun    (and (subrun:subrun-test-initialized? run-dir)
                                                       (not (subrun:subrun-removed? run-dir))))
 				  (test-state    (db:test-get-state new-test-dat))
+                                  (test-status    (db:test-get-status new-test-dat))
 				  (test-fulln    (db:test-get-fullname new-test-dat))
 				  (uname         (db:test-get-uname    new-test-dat))
 				  (toplevel-with-children (and (db:test-get-is-toplevel test)
 							       (> (rmt:test-toplevel-num-items run-id test-name) 0))))
+                             
 			     (case action
 			       ((remove-runs)
 				;; if the test is a toplevel-with-children issue an error and do not remove
 				(cond
                                  (toplevel-with-children
@@ -2258,12 +2260,16 @@
                                  ((member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
                                   (debug:print 1 *default-log-port* "INFO: issuing killreq to test "test-fulln)
                                   (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
                                   (if (not (null? tal))
 				      (loop (car tal)(cdr tal))))
-;                                 ((and (member test-state (list "COMPLETED" "NOT_STARTED")) (member test-status "PREQ_FAIL" "PREQ_DISCARDED" "BLOCKED" "ZERO_ITEMS" "KEEP_TRYING" "TEN_STRIKES" "TIMED_OUT"))
-;                                  (mt:test-set-state-status-by-id run-id (db:test-get-id test) "NOT_STARTED" "n/a" #f))
+                                 ((and (member test-status '("PREQ_FAIL" "PREQ_DISCARDED" "BLOCKED" "ZERO_ITEMS" "KEEP_TRYING" "TEN_STRIKES" "TIMED_OUT")))
+                                  (rmt:set-state-status-and-roll-up-items run-id (db:test-get-id test) 'foo "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
+                                  ;;(mt:test-set-state-status-by-id run-id (db:test-get-id test) "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal)))
+                                  )
                                  (else
                                   (if (not (null? tal))
 				      (loop (car tal)(cdr tal)))
                                   )))
 			       ((set-state-status)