@@ -21,11 +21,11 @@
 				  (equal? "/tmp" bestdir))))
 
 ;; db
 (define row    (vector "a" "b" "c" "blah"))
 (define header (list "col1" "col2" "col3" "col4"))
-(test "Get row by header" "blah" (db-get-value-by-header row header "col4"))
+(test "Get row by header" "blah" (db:get-value-by-header row header "col4"))
 
 ;; (define *toppath* "tests")
 (define *db* #f)
 (test "setup for run" #t (begin (setup-for-run)
 				(string? (getenv "MT_RUN_AREA_HOME"))))
@@ -52,16 +52,16 @@
 (test "write env files" "nada.csh" (begin
                                       (save-environment-as-files "nada")
                                       (and (file-exists? "nada.sh")
     			                 (file-exists? "nada.csh"))))
 
-(test "get all legal tests" (list "runfirst" "sqlitespeed") (sort (get-all-legal-tests) string<=?))
+(test "get all legal tests" (list "runfirst" "runwithfirst" "singletest" "singletest2" "sqlitespeed") (sort (get-all-legal-tests) string<=?))
 
 (test "register-test, test info" "NOT_STARTED"
       (begin
 	(register-test *db* 1 "nada" "")
-	(test:get-state (runs:get-test-info *db* 1 "nada" ""))))
+	(test:get-state (db:get-test-info *db* 1 "nada" ""))))
 
 (test "get-keys" "sysname" (key:get-fieldname (car (sort (db-get-keys *db*)(lambda (a b)(string>=? (vector-ref a 0)(vector-ref b 0)))))))
 
 (define remargs (args:get-args
 		 '("bar" "foo" ":runname" "bob" ":sysname" "ubuntu" ":fsname" "nfs" ":datapath" "blah/foo" "nada")
@@ -80,6 +80,15 @@
 				    (alist->env-vars prevvals)
 				    result))
 
 (test "env restored" "1234" (get-environment-variable "BLAHFOO"))
 
-				    
+
+(test "Items assoc" "Elephant" (cadar (cadr (item-assoc->item-list '(("ANIMAL" "Elephant Lion")("SEASON" "Spring Fall"))))))
+(set! *verbosity* 6)
+(test "Items assoc" '()(item-assoc->item-list '(("a" "a b c d")("b" "c d e")("c" "")("d"))))
+(set! *verbosity* -1)
+(test "Items assoc empty items" '()   (item-assoc->item-list '(("A"))))
+(set! *verbosity* 1)
+(test "Items table" "SEASON" (caadar (item-table->item-list '(("ANIMAL" "Elephant Lion")("SEASON" "Spring Winter")))))
+(test "Items table empty items I" '() (item-table->item-list '(("A"))))
+(test "Items table empty items II" '() (item-table->item-list '(("A" ""))))