Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -53,10 +53,11 @@
 (declare (uses configfmod.import))
 (declare (uses bigmod.import))
 (declare (uses dbmod.import))
 (declare (uses rmtmod.import))
 (declare (uses servermod.import))
+(declare (uses launchmod.import))
 
 ;; (include "call-with-environment-variables/call-with-environment-variables.scm")
 
 (module megatest-main
 	*

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -281,10 +281,11 @@
 	     (if (> num-tries 0)
 		 (begin
 		   (thread-sleep! 2)
 		   (rmt:general-open-connection remote apath dbname num-tries: (- num-tries 1)))
 		 'failed))
+	    
 	    (else
 	     res))))))
 
 ;;======================================================================
 

Index: tests/unittests/basicserver.scm
==================================================================
--- tests/unittests/basicserver.scm
+++ tests/unittests/basicserver.scm
@@ -20,25 +20,30 @@
 
 ;; Run like this:
 ;;
 ;;  ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 
-(import rmtmod trace http-client apimod dbmod)
+(import rmtmod trace http-client apimod dbmod
+	launchmod)
 (trace-call-sites #t)
 (trace
  ;; db:get-dbdat
  ;; rmt:find-main-server
- ;; rmt:send-receive-real
+ rmt:send-receive-real
+ rmt:send-receive
  ;; sexpr->string
 ;; server-ready?
 ;; rmt:register-server
 ;; rmt:open-main-connection
+ rmt:general-open-connection
+ rmt:get-connection
+ common:watchdog
 ;; rmt:find-main-server
 ;; get-all-server-pkts
 ;; get-viable-servers
 ;; get-best-candidate
-;; api:run-server-process
+ ;; api:run-server-process
  )
 
 (test #f #t (rmt:remote? (let ((r (make-rmt:remote)))
 			   (set! *rmt:remote* r)
 			   r)))