Index: tests/unittests/all-api.scm
==================================================================
--- tests/unittests/all-api.scm
+++ tests/unittests/all-api.scm
@@ -52,11 +52,12 @@
 ;;    Delete these API functions after checking that they are not called?
 ;;    Comment them out and give a date to delete. (in the refactor branch?)
 
 ;; 4. get-tests-times:  no such query supported in api.scm, but it is in the list of read-only queries. Remove it? Or implement it if it's in db.scm?
 
-
+(import commonmod)
+(import dbmod)
 (define my-dbstruct (db:setup #t))
 (define toppath (current-directory))
 (define keypatts '(("SYSTEM" "ubuntu")("RELEASE" "v1.234")) )
 (define keys (db:get-keys my-dbstruct))
 
@@ -116,11 +117,11 @@
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-run (list 2))) 0)) ;; delete a non-existant run
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'update-run-stats (list 1 '()))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-main-run-stats (list 1 ))) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-old-deleted-test-records '())) 0))
 (test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-runs (list "%" 10 0 keypatts))) 0))
-(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'simple-get-runs (list "%" 10 0 keypatts))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'simple-get-runs (list "%" 10 0 keypatts 0))) 0))
 (test #f #(#t (1))(api:execute-requests my-dbstruct (vector 'get-all-run-ids '())))
 (test #f #(#t ()) (api:execute-requests my-dbstruct (vector 'get-prev-run-ids '(1))))
 (test #f #(#t "JUSTFINE") (api:execute-requests my-dbstruct (vector 'get-run-status '(1))))
 (test #f #(#t "NEW") (api:execute-requests my-dbstruct (vector 'get-run-state '(1))))
 (test #f #(#t (("Totals" "UNKNOWN" 1) ("bar" "UNKNOWN" 1))) (api:execute-requests my-dbstruct (vector 'get-run-stats '())))

Index: tests/unittests/all-rmt.scm
==================================================================
--- tests/unittests/all-rmt.scm
+++ tests/unittests/all-rmt.scm
@@ -28,40 +28,47 @@
 ;; Definitions:
 ;;   NTN - no test needed
 ;;   DEP - function is deprecated, no point in testing
 ;;   NED - function nested under others, no test needed.
 ;;   DEF - deferred
+
+(import commonmod)
+(import dbmod)
+(use matchable)
 
 (print "start dir: " (current-directory))
        
 (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 '() (server:get-rand-best toppath))
 (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)))
+(test #f #t (string? (server:get-best-guess-address (get-host-name))))
+(test #f #t (string? (car (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
 	 (lambda (server)
-	   (let ((pid (list-ref server 4)))
+	   (let ((pid (list-ref server 2)))
 	     (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)))
+		 (if (number? pid)
+		     (begin
+		       (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))))
 ;; let's start up a server the mechanical way
 (system "nbfake megatest -server -")