Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -44,13 +44,15 @@
 (define (db:get-db dbstruct run-id)
   (if (sqlite3:database? dbstruct) ;; pass sqlite3 databases on through
       dbstruct
       (begin
 	(mutex-lock! *rundb-mutex*)
-	(let ((db (if run-id
+	(let ((db (if (or (not run-id)
+			  (eq? run-id 0))
+		      (db:open-main dbstruct)
 		      (db:open-rundb dbstruct run-id)
-		      (db:open-main dbstruct))))
+		      )))
 	  ;; db prunning would go here
 	  (mutex-unlock! *rundb-mutex*)
 	  db))))
 
 ;; mod-read:
@@ -153,21 +155,22 @@
 		       (* run-id 30000) ;; allow for up to 30k tests per run
 		       run-id)
 		      )) ;; add strings db to rundb, not in use yet
 		(sqlite3:set-busy-handler! db handler)
 		(sqlite3:execute db "PRAGMA synchronous = 1;"))) ;; was 0 but 0 is a gamble
-	  (dbr:dbstruct-set-rundb! dbstruct db)
-	  (dbr:dbstruct-set-inuse! dbstruct #t)
-	  (dbr:dbstruct-set-olddb! dbstruct olddb)
+	  (dbr:dbstruct-set-rundb!  dbstruct db)
+	  (dbr:dbstruct-set-inuse!  dbstruct #t)
+	  (dbr:dbstruct-set-olddb!  dbstruct olddb)
+	  ;; (dbr:dbstruct-set-run-id! dbstruct run-id)
 	  (if local
 	      (begin
 		(dbr:dbstruct-set-localdb! dbstruct run-id db) ;; (dbr:dbstruct-set-inmem! dbstruct db) ;; direct access ...
 		db)
 	      (begin
-		(dbr:dbstruct-set-inmem! dbstruct inmem)
+		(dbr:dbstruct-set-inmem!  dbstruct inmem)
 		(db:sync-tables db:sync-tests-only db inmem)
-		(dbr:dbstruct-set-refdb! dbstruct refdb)
+		(dbr:dbstruct-set-refdb!  dbstruct refdb)
 		(db:sync-tables db:sync-tests-only db refdb)
 		inmem))))))
 
 ;; This routine creates the db. It is only called if the db is not already ls opened
 ;;
@@ -192,19 +195,21 @@
 	      (begin
 		(sqlite3:set-busy-handler! db handler)
 		(sqlite3:execute db "PRAGMA synchronous = 0;")))
 	  (if (not dbexists)
 	      (db:initialize-main-db db))
-	  (dbr:dbstruct-set-main! dbstruct db)
-	  (dbr:dbstruct-set-olddb! dbstruct olddb)
+	  ;; (dbr:dbstruct-set-run-id! dbstruct 0) ;; main.db is the zeroth "run"
+	  (dbr:dbstruct-set-main!   dbstruct db)
+	  (dbr:dbstruct-set-olddb!  dbstruct olddb)
 	  db))))
 
 ;; Make the dbstruct, setup up auxillary db's and call for main db at least once
 ;;
 (define (db:setup run-id #!key (local #f))
   (let* ((dbdir    (conc (configf:lookup *configdat* "setup" "linktree") "/.db"))
 	 (dbstruct (make-dbr:dbstruct path: dbdir local: local)))
+    ;; (dbr:dbstruct-set-run-id! dbstruct run-id)
     ;; isn't this a hold-over from the multi-db in one process? Commenting it out for now ....
     ;; (db:get-db dbstruct #f) ;; force one call to main
     dbstruct))
 
 ;; Open the classic megatest.db file in toppath
@@ -227,25 +232,44 @@
 	  (db:initialize-run-id-db db)))
     db))
 
 ;; sync run to disk if touched
 ;;
-(define (db:sync-touched dbstruct #!key (force-sync #f))
-  (let ((mtime (dbr:dbstruct-get-mtime dbstruct))
-	(stime (dbr:dbstruct-get-stime dbstruct))
-	(rundb (dbr:dbstruct-get-rundb dbstruct))
-	(inmem (dbr:dbstruct-get-inmem dbstruct))
-	(refdb (dbr:dbstruct-get-refdb dbstruct))
-	(olddb (dbr:dbstruct-get-olddb dbstruct)))
-    (if (or (not (number? mtime))
-	    (not (number? stime))
-	    (> mtime stime)
-	    force-sync)
-	(let ((num-synced (db:sync-tables db:sync-tests-only inmem refdb rundb olddb)))
-	  (dbr:dbstruct-set-stime! dbstruct (current-milliseconds))
-	  num-synced)
-	0)))
+(define (db:sync-touched dbstruct run-id #!key (force-sync #f))
+  (let ((mtime  (dbr:dbstruct-get-mtime dbstruct))
+	(stime  (dbr:dbstruct-get-stime dbstruct))
+	(rundb  (dbr:dbstruct-get-rundb dbstruct))
+	(inmem  (dbr:dbstruct-get-inmem dbstruct))
+	(maindb (dbr:dbstruct-get-main  dbstruct))
+	(refdb  (dbr:dbstruct-get-refdb dbstruct))
+	(olddb  (dbr:dbstruct-get-olddb dbstruct))
+	;; (runid  (dbr:dbstruct-get-run-id dbstruct))
+	)
+    (debug:print-info 0 "Syncing for run-id " run-id)
+    (if (eq? run-id 0)
+	;; runid equal to 0 is main.db
+	(if maindb
+	    (if (or (not (number? mtime))
+		    (not (number? stime))
+		    (> mtime stime)
+		    force-sync)
+		(let ((num-synced (db:sync-tables (db:sync-main-list maindb) maindb olddb)))
+		  (dbr:dbstruct-set-stime! dbstruct (current-milliseconds))
+		  num-synced)
+		0)
+	    (begin
+	      (debug:print 0 "WARNING: call to sync main.db to megatest.db but main not initialized")
+	      0))
+	;; any other runid is a run
+	(if (or (not (number? mtime))
+		(not (number? stime))
+		(> mtime stime)
+		force-sync)
+	    (let ((num-synced (db:sync-tables db:sync-tests-only inmem refdb rundb olddb)))
+	      (dbr:dbstruct-set-stime! dbstruct (current-milliseconds))
+	      num-synced)
+	    0))))
 
 ;; close all opened run-id dbs
 (define (db:close-all dbstruct)
   ;; finalize main.db
   (db:sync-touched dbstruct force-sync: #t)

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -352,11 +352,11 @@
       ;; Use this opportunity to sync the inmemdb to db
       (let ((start-time (current-milliseconds))
 	    (sync-time  #f)
 	    (rem-time   #f))
 
-	(if *inmemdb* (db:sync-touched *inmemdb* force-sync: #t))
+	(if *inmemdb* (db:sync-touched *inmemdb* *run-id* force-sync: #t))
 	(set! sync-time  (- (current-milliseconds) start-time))
 	(set! rem-time (quotient (- 4000 sync-time) 1000))
 	(debug:print 0 "SYNC: time= " sync-time ", rem-time=" rem-time)
 
       ;;
@@ -409,11 +409,11 @@
 	    (loop 0 server-state))
 	  (begin
 	    (debug:print-info 0 "Starting to shutdown the server.")
 	    ;; need to delete only *my* server entry (future use)
 	    (set! *time-to-exit* #t)
-	    (if *inmemdb* (db:sync-touched *inmemdb* force-sync: #t))
+	    (if *inmemdb* (db:sync-touched *inmemdb* *run-id* force-sync: #t))
 	    ;;
 	    ;; start_shutdown
 	    ;;
 	    ( tasks:server-set-state! tdb server-id "shutting-down")
 	    (thread-sleep! 5)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1048,11 +1048,11 @@
 	    ;;
 	    ;; (open-run-close tests:register-test db run-id test-name item-path)
 	    ;;
 	    ;; NB// for the above line. I want the test to be registered long before this routine gets called!
 	    ;;
-	    (if (not test-id)(set! test-id (rmt:get-test-id-cached run-id test-name item-path)))
+	    (if (not test-id)(set! test-id (rmt:get-test-id run-id test-name item-path)))
 	    (if (not test-id)
 		(begin
 		  (debug:print 2 "WARN: Test not pre-created? test-name=" test-name ", item-path=" item-path ", run-id=" run-id)
 		  (rmt:general-call 'register-test run-id run-id test-name item-path)
 		  (set! test-id (rmt:get-test-id run-id test-name item-path))))

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -168,11 +168,11 @@
 clean  : 
 	rm cleanprep
 
 kill :
 	killall -v mtest main.sh dboard || true
-	rm -rf *run/db/* */megatest.db */logging.db */monitor.db fullrun/tmp/mt_*/* fullrun/tmp/mt_*/.db* || true
+	rm -rf *run/db/* */megatest.db */logging.db */monitor.db fullrun/tmp/mt_*/* fullrun/tmp/mt_*/.db* fullrun/logs/*.log || true
 	killall -v mtest dboard || true
 
 hardkill : kill
 	sleep 2;killall -v mtest main.sh dboard -9