Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -108,11 +108,11 @@
 				  ))
 		    (let ((exinfo (vector-ref exit-info 2))
 			  (logfna (if logpro-used (conc stepname ".html") "")))
 		      (rmt:teststep-set-status! run-id test-id stepname "end" exinfo #f logfna))
 		    (if logpro-used
-			(rmt:test-set-log! test-id (conc stepname ".html")))
+			(rmt:test-set-log! run-id test-id (conc stepname ".html")))
 		    ;; set the test final status
 		    (let* ((this-step-status (cond
 					      ((and (eq? (vector-ref exit-info 2) 2) logpro-used) 'warn)
 					      ((eq? (vector-ref exit-info 2) 0)                   'pass)
 					      (else 'fail)))
@@ -134,11 +134,11 @@
 			 ;; NB// test-set-status! does rdb calls under the hood
 			 (tests:test-set-status! test-id "RUNNING" "WARN" 
 						 (if (eq? this-step-status 'warn) "Logpro warning found" #f)
 						 #f))
 			((pass)
-			 (tests:test-set-status! test-id "RUNNING" "PASS" #f #f))
+			 (tests:test-set-status! run-id test-id "RUNNING" "PASS" #f #f))
 			(else ;; 'fail
 			 (set! rollup-status 1) ;; force fail
 			 (tests:test-set-status! test-id "RUNNING" "FAIL" (conc "Failed at step " stepname) #f)
 			 ))))
 		  (if (and (steprun-good? logpro-used (vector-ref exit-info 2))
@@ -148,11 +148,11 @@
 		(debug:print 4 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))
 	  
 	  ;; Once done with step/steps update the test record
 	  ;;
 	  (let* ((item-path (db:test-get-item-path testdat)) ;; (item-list->path itemdat))
-		 (testinfo  (rmt:get-testinfo-by-id run-id test-id))) ;; refresh the testdat, call it iteminfo in case need prev/curr
+		 (testinfo  (rmt:get-testinfo-state-status run-id test-id))) ;; refresh the testdat, call it iteminfo in case need prev/curr
 	    ;; Am I completed?
 	    (if (equal? (db:test-get-state testinfo) "RUNNING") ;; (not (equal? (db:test-get-state testinfo) "COMPLETED"))
 		(let ((new-state  (if kill-job "KILLED" "COMPLETED") ;; (if (eq? (vector-ref exit-info 2) 0) ;; exited with "good" status
 				  ;; "COMPLETED"
 				  ;; (db:test-get-state testinfo)))   ;; else preseve the state as set within the test
@@ -166,18 +166,18 @@
 				   ((eq? rollup-status 2)
 				    ;; if the current status is AUTO the defer to the calculated value but qualify (i.e. make this AUTO-WARN)
 				    (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO-WARN" "WARN"))
 				   (else "FAIL")))) ;; (db:test-get-status testinfo)))
 		  (debug:print-info 2 *default-log-port* "Test NOT logged as COMPLETED, (state=" (db:test-get-state testinfo) "), updating result, rollup-status is " rollup-status)
-		  (tests:test-set-status! test-id 
+		  (tests:test-set-status! run-id test-id 
 					  new-state
 					  new-status
 					  (args:get-arg "-m") #f)
 		  ;; need to update the top test record if PASS or FAIL and this is a subtest
 		  (if (not (equal? item-path ""))
-		      (cdb:set-state-status-and-roll-up-items *runremote* run-id test-name item-path new-status))))
+                      (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status #f))))
 	    ;; for automated creation of the rollup html file this is a good place...
 	    (if (not (equal? item-path ""))
 		(tests:summarize-items #f run-id test-id test-name #f)) ;; don't force - just update if no
 	    )))
     (pop-directory)
     rollup-status))