Index: tests/tests.scm
==================================================================
--- tests/tests.scm
+++ tests/tests.scm
@@ -49,10 +49,20 @@
 ;;   (for-each
 ;;    (lambda (file)
 ;;      (print "Loading " file)
 ;;      (load file))
 ;;    files))
+
+(define-syntax run-in-thread
+  (syntax-rules ()
+    ((_ body ...)
+     (let ((th1 (make-thread (lambda ()
+			       body ...)
+			     "the thread")))
+       (thread-start! th1)
+       (thread-join! th1)))))
+
 
 (let* ((unit-test-name (list-ref (argv) 4))
        (fname          (conc "../unittests/" unit-test-name ".scm")))
   (if (file-exists? fname)
       (load fname)

Index: tests/unittests/all-rmt.scm
==================================================================
--- tests/unittests/all-rmt.scm
+++ tests/unittests/all-rmt.scm
@@ -91,13 +91,15 @@
 ;;             (list (list "localhost"  #t (get-host-name))
 ;;                   (list "not-a-host" #t "not-a-host"  ))
 ;;             post-proc: pair?)
 ;;                                            
 ;; (test #f #t (list? (rmt:get-changed-record-ids 0)))
-;; 
-(test #f #f (begin (runs:update-all-test_meta #f) #f))
- 
+;;
+
+(run-in-thread
+
+ ;; (test #f #f (begin (runs:update-all-test_meta #f) #f)) 
 (test #f '("test1" "test2")(sort (alist-ref "tagtwo" (rmt:get-tests-tags) equal?) string<=?))
 (test #f '() (rmt:get-key-val-pairs 0))
 (test #f '("SYSTEM" "RELEASE") (rmt:get-keys))
 (test #f '("SYSTEM" "RELEASE") (rmt:get-keys-write)) ;; dummy query to force server start
 (test #f '() (rmt:get-key-vals 1))
@@ -146,11 +148,11 @@
 (test #f '()(rmt:get-prev-run-ids 1))
 (test #f #t (begin (rmt:lock/unlock-run 1 #t #f "mikey") #t))
 (test #f "JUSTFINE" (rmt:get-run-status 1))
 (test #f #t (begin (rmt:set-run-status 1 "NOTFINE" msg: "A message") #t))
 (test #f #t (begin (rmt:update-run-event_time 1) #t))
-
+)
 ;; (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update) ;; fields of #f uses default
 ;;
 (let ((keys (rmt:get-keys))
       (rnp  "%")    ;; run name patt
       (tpt  "%/%")) ;; target patt

Index: tests/unittests/basicserver.scm
==================================================================
--- tests/unittests/basicserver.scm
+++ tests/unittests/basicserver.scm
@@ -52,19 +52,10 @@
  ;;
  ;; wait-and-close
  ;; run-listener
  )
 
-(define-syntax run-in-thread
-  (syntax-rules ()
-    ((_ body ...)
-     (let ((th1 (make-thread (lambda ()
-			       body ...)
-			     "the thread")))
-       (thread-start! th1)
-       (thread-join! th1)))))
-
 
 (test #f #t (servdat? (let ((s (make-servdat)))
 			  (set! *servdat* s)
 			  s)))
 (test #f #f (rmt:get-conn *servdat* *toppath* ".db/main.db"))

Index: tests/unittests/server.scm
==================================================================
--- tests/unittests/server.scm
+++ tests/unittests/server.scm
@@ -53,21 +53,21 @@
 (define *db* (db:setup ".db/main.db"))
 
 ;; these let me cut and paste from source easily
 (define apath *toppath*)
 (define dbname ".db/2.db")
-(define remote *remotedat*)
+(define remote *db-serv-info*)
 (define keyvals  '(("SYSTEM" "a")("RELEASE" "b")))
 
 (test #f #t (rmt:open-main-connection remote apath))
-(test #f #t (conndat? (rmt:get-conn *remotedat* *toppath* ".db/main.db")))
-(test #f #t (conndat? (rmt:get-conn *remotedat* *toppath* ".db/main.db")))
-(test #f ".db/2.db" (list-ref (rmt:send-receive-real *remotedat* *toppath* ".db/main.db" 'get-server `(,apath ,dbname))
-			      6))
+(test #f #t (conndat? (rmt:get-conn *db-serv-info* *toppath* ".db/main.db")))
+(test #f #t (conndat? (rmt:get-conn *db-serv-info* *toppath* ".db/main.db")))
+(test #f 'server-started (rmt:send-receive-real *db-serv-info* *toppath* ".db/main.db"
+					   'start-server `(,apath ,dbname)))
 
 (thread-sleep! 2)
-(test #f #t (rmt:general-open-connection *remotedat* *toppath* ".db/2.db"))
+(test #f #t (rmt:general-open-connection *db-serv-info* *toppath* ".db/2.db"))
 
 ;; (let loop ((end-time (+ (current-seconds) 61)))
   (test #f #t (list? (rmt:get-servers-info *toppath*)))
 
   (test #f '("SYSTEM" "RELEASE") (rmt:get-keys))
@@ -75,16 +75,16 @@
   ;; (print "Got here.")
 
   (test #f 1 (rmt:send-receive 'register-run 1 (list keyvals "run1" "new" "n/a" "justme" #f)))
 
   (test #f 2 (rmt:register-run keyvals "run2" "new" "n/a" "justme" #f))
-  ;; (test #f 2 (rmt:deregister-server *remotedat* *toppath* iface port server-key dbname
+  ;; (test #f 2 (rmt:deregister-server *db-serv-info* *toppath* iface port server-key dbname
 
-  (test #f 2 (rmt:get-count-servers *remotedat* *toppath*))
+  (test #f 2 (rmt:get-count-servers *db-serv-info* *toppath*))
 
   (test #f "run2" (rmt:get-run-name-from-id 2))
   (test #f #f     (rmt:send-receive 'get-test-info-by-id 2 '(2 1)))
   
   (test #f #t     (rmt:general-call 'update-cpuload-diskfree 2 1.5 1e6 1))
 ;;  (if (< (current-seconds) end-time)(loop end-time)))
 
 (exit)