Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -88,11 +88,13 @@
 ;;
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
   (if (common:file-exists? debugcontrolf)
     (begin
       ;; for some reason, debug:print does not work here. Had to use print.
-      (print (conc "WARNING: loading " debugcontrolf))
+      (with-output-to-port (current-error-port)
+	(lambda ()
+	  (print (conc "WARNING: loading " debugcontrolf))))
       (load debugcontrolf)
     )
   )
 )
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1354,12 +1354,16 @@
 			      #f ;; yes, really
 			      (list (car tal)(cdr tal) reg reruns))
 			  (begin
 			    (if (runs:lownoise (conc "FAILED prerequisites or other issue" hed) 60)
 				(debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequisites or other issue. Internal state >" nth-try "< will be overridden and we'll retry."))
-			    ;; was: (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "KEEP_TRYING" #f)
-                            (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path "COMPLETED" "PREQ_FAIL" #f)
+			    (let* ((test-id      (rmt:get-test-id run-id testname item-path))
+				   (test-info    (rmt:get-testinfo-state-status run-id test-id)) ;; we need *current* info
+				   (status       (db:test-status test-info)))
+			      (if (equal? status "KEEP_TRYING")
+				  (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path "COMPLETED" "PREQ_FAIL" #f)
+				  (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "KEEP_TRYING" #f)))
 			    (hash-table-set! test-registry hed 'removed) ;; was 0
                             (if (not (and (null? reg) (null? tal)))
                                 (runs:loop-values tal reg reglen regfull reruns)
                                 #f))))
 		     (else
@@ -2028,11 +2032,11 @@
     ;;
     ;; There is now a single call to runs:update-all-test_meta and this 
     ;; per-test call is not needed. Given the delicacy of the move to 
     ;; v1.55 this code is being left in place for the time being.
     ;;
-    (if (not (hash-table-ref/default *test-meta-updated* test-name #f))
+    (if (not (hash-table-exists? *test-meta-updated* test-name))
         (begin
           (hash-table-set! *test-meta-updated* test-name #t)
           (runs:update-test_meta test-name test-conf)))
     
     ;; itemdat => ((ripeness "overripe") (temperature "cool") (season "summer"))