Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -1147,11 +1147,11 @@
 	      (debug:print-error 0 *default-log-port* "failed to find the top path to your Megatest area.")
 	      (set! *toppath* #f) ;; force it to be false so we return #f
 	      #f))
 
 	;; needed by various transport and db modules
-	(dbfile:testsuite-name (get-testsuite-name *toppath* *configdat*))
+	(dbfile:testsuite-name (common:get-testsuite-name)) ;; (get-testsuite-name *toppath* *configdat*))
 
         ;; one more attempt to cache the configs for future reading
         (let* ((cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
                (mtcachef     (car cachefiles))
                (rccachef     (cdr cachefiles)))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -75,11 +75,11 @@
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
 
 (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
      readline apropos json http-client directory-utils typed-records
-     http-client srfi-18 extras format)
+     http-client srfi-18 extras format tcp-server tcp)
 
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
@@ -381,10 +381,11 @@
 			"-load"        ;; load and exectute a scheme file
 			"-section"
 			"-var"
 			"-dumpmode"
 			"-run-id"
+			"-db"
 			"-ping"
 			"-refdb2dat"
 			"-o"
 			"-log"
                         "-sync-log"
@@ -928,18 +929,19 @@
 ;;======================================================================
 
 ;; Server? Start up here.
 ;;
 (if (args:get-arg "-server")
-    (let* ((run-id (args:get-arg-number "-run-id"))
-	   (tl        (launch:setup)))
+    (let* ((run-id     (args:get-arg "-run-id"))
+	   (dbfname    (args:get-arg "-db"))
+	   (tl         (launch:setup)))
       (case (rmt:transport-mode)
 	((http)(http-transport:launch))
 	((tcp)
 	 (debug:print 0 *default-log-port* "INFO: Running using tcp method.")
 	 (if run-id
-	     (tt:start-server tl run-id (dbmod:run-id->dbfname run-id) api:dispatch-request)
+	     (tt:start-server tl run-id dbfname api:dispatch-request)
 	     (begin
 	       (debug:print 0 *default-log-port* "ERROR: transport mode is tcp - -run-id is required.")
 	       (exit 1))))
 	(else (debug:print 0 *default-log-port* "ERROR: rmt:transport-mode value not recognised "(rmt:transport-mode))))
       (set! *didsomething* #t)))