@@ -20,14 +20,10 @@
 
 ;;======================================================================
 ;; Tests
 ;;======================================================================
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
-(import (prefix sqlite3 sqlite3:))
-(require-library stml)
-
 (declare (unit tests))
 (declare (uses lock-queue))
 (declare (uses db))
 (declare (uses tdb))
 (declare (uses common))
@@ -34,10 +30,22 @@
 ;; (declare (uses dcommon)) ;; needed for the steps processing
 (declare (uses items))
 (declare (uses runconfig))
 ;; (declare (uses sdb))
 (declare (uses server))
+
+(module tests
+    *
+
+(import chicken scheme data-structures extras srfi-13 ports )
+
+(import common)
+
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
+(import (prefix sqlite3 sqlite3:))
+(require-library stml)
+
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
@@ -1936,5 +1944,6 @@
   #f)
 
 (define (test:archive-tests db keynames target)
   #f)
 
+)