@@ -21,10 +21,11 @@
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit mt))
 (declare (uses debugprint))
 (declare (uses db))
+(declare (uses dbmod))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
 (declare (uses tests))
 (declare (uses server))
@@ -31,11 +32,12 @@
 (declare (uses runs))
 (declare (uses rmt))
 (declare (uses rmtmod))
 
 (import debugprint
-	rmtmod)
+	rmtmod
+	dbmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
@@ -296,17 +298,19 @@
   )
 
 (define (rmt:client-side-set-state-status-and-roll-up  run-id test-name item-path state status comment)
   ;; establish info on incoming test followed by info on top level test
   ;; BBnote - for mode itemwait, linkage between upstream test & matching item status is propagated to run queue in db:prereqs-not-met
-  (let* ((testdat      (if (number? test-name)
-			   (rmt:get-test-info-by-id run-id test-name) ;; test-name is actually a test-id
-			   (db:keep-trying-until-true ;; in our threaded stuff this call could happen before the test is registered (maybe?)
-			    rmt:get-test-info
+  (let* ((test-id      (if (number? test-name)
+			   test-name
+			   (db:keep-trying-until-true
+			    rmt:get-test-id
 			    (list run-id test-name item-path)
-			    10)))
-	 (test-id      (db:test-get-id testdat))
+			   10)))
+			   ;; (rmt:get-test-id run-id test-name item-path)))
+	 (testdat      (rmt:get-test-info-by-id run-id test-id))
+	 ;; (test-id      (db:test-get-id testdat))
 	 (test-name    (if (number? test-name)
 			   (db:test-get-testname testdat)
 			   test-name))
 	 (item-path    (db:test-get-item-path testdat))
          (tl-testdat   (rmt:get-test-info run-id test-name ""))
@@ -415,14 +419,10 @@
 			      "Test stopped responding while in RUNNING or REMOTEHOSTSTART; presumed dead.")))))))
 	     ;; call end of eud of run detection for posthook - from merge, is it needed?
 	     ;; (launch:end-of-run-check run-id)
 	     all-ids)
 	    )))))
-
-
-
-
 
 (define (mt:lazy-read-test-config test-name)
   (let ((tconf (hash-table-ref/default *testconfigs* test-name #f)))
     (if tconf
 	tconf