@@ -104,24 +104,21 @@
 	      (server:client-setup db))
 	  ;; (set! *cache-on* #t)
 	  (set-megatest-env-vars db run-id) ;; these may be needed by the launching process
 	  (change-directory work-area) 
 
-	  ;; Open up the test specific database
-	  (set! tdb (open-test-db work-area))
 	  (on-exit (lambda ()
-		     (debug:print 0 "Finalizing both tdb and db!!!")
-		     (sqlite3:finalize! tdb)
+		     (debug:print 0 "Finalizing db!!!")
 		     (sqlite3:finalize! db)))
 
 	  (set-run-config-vars db run-id)
 	  ;; environment overrides are done *before* the remaining critical envars.
 	  (alist->env-vars env-ovrd)
 	  (set-megatest-env-vars db run-id)
 	  (set-item-env-vars itemdat)
 	  (save-environment-as-files "megatest")
-	  (test-set-meta-info db tdb run-id test-name itemdat)
+	  (test-set-meta-info db test-id run-id test-name itemdat)
 	  (test-set-status! db test-id "REMOTEHOSTSTART" "n/a" (args:get-arg "-m") #f)
 	  (if (args:get-arg "-xterm")
 	      (set! fullrunscript "xterm")
 	      (if (and fullrunscript (not (file-execute-access? fullrunscript)))
 		  (system (conc "chmod ug+x " fullrunscript))))
@@ -270,11 +267,11 @@
 				       ;; (if (not (args:get-arg "-server"))
 				       ;;	   (server:client-setup db))
 				       ;; (if (not cpuload)  (begin (debug:print 0 "WARNING: CPULOAD not found.")  (set! cpuload "n/a")))
 				       ;; (if (not diskfree) (begin (debug:print 0 "WARNING: DISKFREE not found.") (set! diskfree "n/a")))
 				       (set! kill-job? (test-get-kill-request db run-id test-name itemdat))
-				       (test-set-meta-info db tdb run-id test-name itemdat minutes: minutes)
+				       (test-set-meta-info db test-id run-id test-name itemdat minutes: minutes)
 				       ;; (rdb:test-update-meta-info db test-id minutes cpuload diskfree tmpfree)
 				       (if kill-job? 
 					   (begin
 					     (mutex-lock! m)
 					     (let* ((pid (vector-ref exit-info 0)))