@@ -259,10 +259,11 @@
 
     (if (not (null? required-tests))
 	(debug:print 1 "INFO: Adding " required-tests " to the run queue"))
     ;; NOTE: these are all parent tests, items are not expanded yet.
     (runs:run-tests-queue db run-id runname test-records keyvallst flags)
+    (if *rpc:listener* (server:keep-running db))
     (debug:print 4 "INFO: All done by here")))
 
 (define (runs:run-tests-queue db run-id runname test-records keyvallst flags)
     ;; At this point the list of parent tests is expanded 
     ;; NB// Should expand items here and then insert into the run queue.
@@ -362,12 +363,13 @@
 	
       ;; we get here on "drop through" - loop for next test in queue
       (if (null? tal)
 	  (begin
 	    ;; FIXME!!!! THIS SHOULD NOT REQUIRE AN EXIT!!!!!!!
-	    (debug:print 1 "INFO: All tests launched, exiting")
-	    (exit 0))
+	    (debug:print 1 "INFO: All tests launched")
+	    ;; (exit 0)
+	    )
 	  (loop (car tal)(cdr tal))))))
 
 ;; parent-test is there as a placeholder for when parent-tests can be run as a setup step
 (define (run:test db run-id runname keyvallst test-record flags parent-test)
   ;; All these vars might be referenced by the testconfig file reader
@@ -597,11 +599,11 @@
 	(set! db   (open-db))
 	(if (args:get-arg "-server")
 	    (server:start db (args:get-arg "-server"))
 	    (if (not (or (args:get-arg "-runall")
 			  (args:get-arg "-runtests")))
-		(set! th1 (server:client-setup db))))
+		(server:client-setup db)))
 	(set! keys (rdb:get-keys db))
 	;; have enough to process -target or -reqtarg here
 	(if (args:get-arg "-reqtarg")
 	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
 		   (runconfig  (read-config runconfigf #f #f environ-patt: #f)))