Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -2604,18 +2604,10 @@
 		(db:general-call dbdat 'top-test-set (list "LAUNCHED" test-name))
 		(db:general-call dbdat 'top-test-set-per-pf-counts (list test-name run-id test-name test-name test-name))))
 	#f)
       #f))
 
-(define (db:tests-register-test dbstruct run-id test-name item-path)
-  (db:with-db
-   dbstruct
-   run-id
-   #t
-   (lambda (db)
-     (sqlite3:execute db 'register-test run-id test-name item-path))))
-
 (define (db:test-get-logfile-info dbstruct run-id test-name)
   (db:with-db
    dbstruct
    run-id
    #f

Index: tests/unittests/basicserver.scm
==================================================================
--- tests/unittests/basicserver.scm
+++ tests/unittests/basicserver.scm
@@ -19,42 +19,44 @@
 ;; (test #f '("SYSTEM" "RELEASE") (rmt:get-keys))
 
 ;; (exit)
 
 ;; Server tests go here 
-(for-each (lambda (run-id)
-(test #f #f (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id))
-(server:kind-run run-id)
-(test "did server start within 20 seconds?"
-      #t
-      (let loop ((remtries 20)
-		 (running (tasks:server-running-or-starting? (db:delay-if-busy
-							      (tasks:open-db))
-							     run-id)))
-	(if running 
-	    (> running 0)
-	    (if (> remtries 0)
-		(begin
-		  (thread-sleep! 1)
-		  (loop (- remtries 1)
-			(tasks:server-running-or-starting? (db:delay-if-busy
-							    (tasks:open-db))
-							   run-id)))))))
-
-(test "did server become available" #t
-      (let loop ((remtries 10)
-		 (res      (tasks:get-server (db:delay-if-busy (tasks:open-db)) run-id)))
-	(if res
-	    (vector? res)
-	    (begin
-	      (if (> remtries 0)
-		  (begin
-		    (thread-sleep! 1.1)
-		    (loop (- remtries 1)(tasks:get-server (db:delay-if-busy (tasks:open-db)) run-id)))
-		  res)))))
-)
-(list 0 1))
+(for-each
+ (lambda (run-id)
+   (test #f #f (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id))
+   (server:kind-run run-id)
+   (test "did server start within 20 seconds?"
+	 #t
+	 (let loop ((remtries 20)
+		    (running (tasks:server-running-or-starting? (db:delay-if-busy
+								 (tasks:open-db))
+								run-id)))
+	   (if running 
+	       (> running 0)
+	       (if (> remtries 0)
+		   (begin
+		     (thread-sleep! 1)
+		     (loop (- remtries 1)
+			   (tasks:server-running-or-starting? (db:delay-if-busy
+							       (tasks:open-db))
+							      run-id)))))))
+   
+   (test "did server become available" #t
+	 (let loop ((remtries 10)
+		    (res      (tasks:get-server (db:delay-if-busy (tasks:open-db)) run-id)))
+	   (if res
+	       (vector? res)
+	       (begin
+		 (if (> remtries 0)
+		     (begin
+		       (thread-sleep! 1.1)
+		       (loop (- remtries 1)(tasks:get-server (db:delay-if-busy (tasks:open-db)) run-id)))
+		     res)))))
+   )
+ (list 0 1))
+
 (define user    (current-user-name))
 (define runname "mytestrun")
 (define keys    (rmt:get-keys))
 (define runinfo #f)
 (define keyvals '(("SYSTEM" "abc")("RELEASE" "def")))