Index: tests/unittests/all-rmt.scm
==================================================================
--- tests/unittests/all-rmt.scm
+++ tests/unittests/all-rmt.scm
@@ -32,11 +32,33 @@
 ;;   DEF - deferred
 
 (print "start dir: " (current-directory))
        
 (define toppath (current-directory))
-(test #f #t (string?(server:start-and-wait *toppath*)))
+
+(test #f #f (server:check-if-running toppath))           ;; these are used by server:start-and-wait
+(test #f #t (list? (server:get-list toppath)))
+(let ((servers (server:get-list toppath)))
+  (print "Known servers: "  servers)
+  (if (not (null? servers))
+      (begin
+	(for-each
+	 (lambda (server)
+	   (let ((pid (list-ref server 4)))
+	     (thread-start!
+	      (make-thread
+	       (lambda ()
+		 (print "Attempting to kill server: " server)
+		 (print "Attempting to kill pid " pid)
+		 (system (conc "kill " pid))
+		 (thread-sleep! 2)
+		 (system (conc "kill -9 " pid)))
+	       (conc pid)))))
+	 servers)
+	(thread-sleep! 2))))
+(test #f '() (server:get-best '()))
+(test #f #t (string? (server:start-and-wait *toppath*)))
 
 (test "setup for run" #t (begin (launch:setup)
  				(string? (getenv "MT_RUN_AREA_HOME"))))
 (test #f #t (vector? (client:setup toppath)))