@@ -20,21 +20,22 @@
 
 ;;======================================================================
 ;; Tests
 ;;======================================================================
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
-(import (prefix sqlite3 sqlite3:))
+(import
+ srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils
+ (prefix sqlite3 sqlite3:))
 
-(declare (unit tests))
+(declare (unit testsmod))
 (declare (uses lock-queue))
-(declare (uses db))
-(declare (uses common))
-(declare (uses items))
-(declare (uses runconfig))
+(declare (uses dbmod))
+(declare (uses commonmod))
+(declare (uses itemsmod))
+(declare (uses runconfigmod))
 
-(include "common_records.scm")
+;; (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")