Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1501,24 +1501,27 @@
 			 (conc key " like '" val "'"))
 		       keynames 
 		       (string-split target "/"))
 		  " AND "))
 	 (testqry (tests:match->sqlqry testpatt))
-	 (runsqry (sqlite3:prepare db (conc "SELECT id FROM runs WHERE " keystr " AND runname LIKE '" runname "';")))
-	 (tstsqry (sqlite3:prepare db (conc "SELECT rundir FROM tests WHERE run_id=? AND " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;"))))
+	 (rqry    (conc "SELECT id FROM runs WHERE " keystr " AND runname LIKE '" runname "';"))
+	 (runsqry (sqlite3:prepare db rqry))
+	 (tqry    (conc "SELECT rundir FROM tests WHERE run_id=? AND " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;"))
+	 (tstsqry (sqlite3:prepare db tqry)))
+    (debug:print 8 "db:test-get-paths-matching-keynames-target-new\n  rqry=" rqry "\n  tqry=" tqry)
     (sqlite3:for-each-row
      (lambda (rid)
        (set! row-ids (cons rid row-ids)))
      runsqry)
+    (sqlite3:finalize! runsqry)
     (for-each (lambda (rid)
 		(sqlite3:for-each-row 
 		 (lambda (p)
 		   (set! res (cons p res)))
 		 tstsqry rid))
 	      row-ids)
     (sqlite3:finalize! tstsqry)
-    (sqlite3:finalize! runsqry)
     res))
 
 ;; look through tests from matching runs for a file
 (define (db:test-get-first-path-matching db keynames target fname)
   ;; [refpaths] is the section where references to other megatest databases are stored

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -499,11 +499,11 @@
 	 (lnkbase  (conc linktree "/" target "/" runname))
 	 (lnkpath  (conc lnkbase "/" testname))
 	 (lnkpathf (conc lnkpath (if not-iterated "" "/") item-path)))
 
     ;; Update the rundir path in the test record for all
-    (rmt:general-call 'test-set-rundir-by-test-id test-id lnkpathf)
+    (rmt:general-call 'test-set-rundir-by-test-id lnkpathf test-id)
 
     (debug:print 2 "INFO:\n       lnkbase=" lnkbase "\n       lnkpath=" lnkpath "\n  toptest-path=" toptest-path "\n     test-path=" test-path)
     (if (not (file-exists? linktree))
 	(begin
 	  (debug:print 0 "WARNING: linktree did not exist! Creating it now at " linktree)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -968,11 +968,11 @@
 	  (if (args:get-arg "-setlog")
 	      (let ((logfname (args:get-arg "-setlog")))
 		(rmt:test-set-log! test-id logfname)))
 	  (if (args:get-arg "-set-toplog")
 	      ;; DO NOT run remote
-	      (tests:test-set-toplog! db run-id test-name (args:get-arg "-set-toplog")))
+	      (tests:test-set-toplog! run-id test-name (args:get-arg "-set-toplog")))
 	  (if (args:get-arg "-summarize-items")
 	      ;; DO NOT run remote
 	      (tests:summarize-items db run-id test-id test-name #t)) ;; do force here
 	  (if (args:get-arg "-runstep")
 	      (if (null? remargs)

Index: tests/fullrun/tests/runfirst/main.sh
==================================================================
--- tests/fullrun/tests/runfirst/main.sh
+++ tests/fullrun/tests/runfirst/main.sh
@@ -30,7 +30,9 @@
 if [[ `basename $PWD` == "mustfail" ]];then
   $MT_MEGATEST -test-status :state COMPLETED :status FAIL
 else
   $MT_MEGATEST -test-status :state COMPLETED :status $loadstatus -m "This is a test level comment" :value 10e6 :expected_value 1.1e6 :tol 100e3 :category nada :variable sillyvar :units mFarks :comment "This is the value/expected comment"
 fi
+
+env > envfile.txt
 
 # $MT_MEGATEST -test-status :state COMPLETED :status FAIL