Index: tests/unittests/all-rmt.scm
==================================================================
--- tests/unittests/all-rmt.scm
+++ tests/unittests/all-rmt.scm
@@ -35,10 +35,18 @@
        
 (define toppath (current-directory))
 
 (test #f #f (server:check-if-running toppath))           ;; these are used by server:start-and-wait
 (test #f #t (list? (server:get-list toppath)))
+(test #f '() (server:get-best '()))
+(test #f #t (common:simple-file-lock-and-wait "test.lock" expire-time: 15))
+(test #f "test.lock" (common:simple-file-release-lock "test.lock"))
+(test #f #t (server:get-best-guess-address (get-host-name)))
+(test #f #t (string? (common:get-homehost)))
+
+;; clean out any old running servers
+;;
 (let ((servers (server:get-list toppath)))
   (print "Known servers: "  servers)
   (if (not (null? servers))
       (begin
 	(for-each
@@ -53,15 +61,18 @@
 		 (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*)))
+;; let's start up a server the mechanical way
+(system "nbfake megatest -server -")
+(thread-sleep! 2)
+;; (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 (client:setup-http toppath))
 (test #f #t (vector? (client:setup toppath)))
 
 (test #f #t (vector? (rmt:get-connection-info toppath))) ;; TODO: push areapath down.
 (test #f #t (string? (server:check-if-running ".")))
 ;; DEF (test #f #f (rmt:send-receive-no-auto-client-setup *runremote* 'get-keys #f '()))