Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -136,11 +136,11 @@
 (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "common_records.scm")
-
+(include "test_records.scm")
 
 ;; http - use the old http + in /tmp db
 ;; tcp  - use tcp transport with cachedb db
 ;; nfs  - use direct to disk access (read-only)
 ;;

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -68,11 +68,11 @@
 (declare (uses subrunmod))
 (declare (uses subrunmod.import))
 (declare (uses archivemod))
 (declare (uses archivemod.import))
 (declare (uses runsmod))
-(declare (uses runsmod.import))
+;; (declare (uses runsmod.import))
 (declare (uses cpumod))
 (declare (uses cpumod.import))
 (declare (uses runsmod))
 (declare (uses ezstepsmod))
 (declare (uses launchmod))

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -45,10 +45,10 @@
 
 (include "common_records.scm")
 ;; (include "key_records.scm")
 ;; (include "db_records.scm")
 (include "run_records.scm")
-(include "test_records.scm")
+;; (include "test_records.scm")
 
 ;; This is the Megatest API. All generally "useful" routines will be wrapped or extended
 ;; here.
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -46,11 +46,11 @@
 
 (include "common_records.scm")
 ;; (include "key_records.scm")
 ;; (include "db_records.scm")
 (include "run_records.scm")
-(include "test_records.scm")
+;; (include "test_records.scm")
 
 ;; (include "debugger.scm")
 
 (import commonmod
 	processmod

Index: runsmod.scm
==================================================================
--- runsmod.scm
+++ runsmod.scm
@@ -131,11 +131,11 @@
 
 (include "common_records.scm")
 ;; (include "key_records.scm")
 ;; (include "db_records.scm")
 (include "run_records.scm")
-(include "test_records.scm")
+;; (include "test_records.scm")
 
 ;; use this struct to facilitate refactoring
 ;;
 
 (defstruct runs:dat

Index: test_records.scm
==================================================================
--- test_records.scm
+++ test_records.scm
@@ -15,22 +15,22 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; make-vector-record tests testqueue testname testconfig waitons priority items
 (define (make-tests:testqueue)(make-vector 7 #f))
-(define-inline (tests:testqueue-get-testname     vec)    (vector-ref  vec 0))
-(define-inline (tests:testqueue-get-testconfig   vec)    (vector-ref  vec 1))
-(define-inline (tests:testqueue-get-waitons      vec)    (vector-ref  vec 2))
-(define-inline (tests:testqueue-get-priority     vec)    (vector-ref  vec 3))
-;; items: #f=no items, list=list of items remaining, proc=need to call to get items
-(define-inline (tests:testqueue-get-items        vec)    (vector-ref  vec 4))
-(define-inline (tests:testqueue-get-itemdat      vec)    (vector-ref  vec 5))
-(define-inline (tests:testqueue-get-item_path    vec)    (vector-ref  vec 6))
-
-(define-inline (tests:testqueue-set-testname!    vec val)(vector-set! vec 0 val))
-(define-inline (tests:testqueue-set-testconfig!  vec val)(vector-set! vec 1 val))
-(define-inline (tests:testqueue-set-waitons!     vec val)(vector-set! vec 2 val))
-(define-inline (tests:testqueue-set-priority!    vec val)(vector-set! vec 3 val))
-(define-inline (tests:testqueue-set-items!       vec val)(vector-set! vec 4 val))
-(define-inline (tests:testqueue-set-itemdat!     vec val)(vector-set! vec 5 val))
-(define-inline (tests:testqueue-set-item_path!   vec val)(vector-set! vec 6 val))
+(define (tests:testqueue-get-testname     vec)    (vector-ref  vec 0))
+(define (tests:testqueue-get-testconfig   vec)    (vector-ref  vec 1))
+(define (tests:testqueue-get-waitons      vec)    (vector-ref  vec 2))
+(define (tests:testqueue-get-priority     vec)    (vector-ref  vec 3))
+;; items: #f=no items, list=list of items remaining, proc=need to call to get items
+(define (tests:testqueue-get-items        vec)    (vector-ref  vec 4))
+(define (tests:testqueue-get-itemdat      vec)    (vector-ref  vec 5))
+(define (tests:testqueue-get-item_path    vec)    (vector-ref  vec 6))
+
+(define (tests:testqueue-set-testname!    vec val)(vector-set! vec 0 val))
+(define (tests:testqueue-set-testconfig!  vec val)(vector-set! vec 1 val))
+(define (tests:testqueue-set-waitons!     vec val)(vector-set! vec 2 val))
+(define (tests:testqueue-set-priority!    vec val)(vector-set! vec 3 val))
+(define (tests:testqueue-set-items!       vec val)(vector-set! vec 4 val))
+(define (tests:testqueue-set-itemdat!     vec val)(vector-set! vec 5 val))
+(define (tests:testqueue-set-item_path!   vec val)(vector-set! vec 6 val))
 

Index: testsmod.scm
==================================================================
--- testsmod.scm
+++ testsmod.scm
@@ -129,11 +129,11 @@
 
 (include "common_records.scm")
 ;; (include "key_records.scm")
 ;; (include "db_records.scm")
 (include "run_records.scm")
-(include "test_records.scm")
+;; (include "test_records.scm")
 (include "js-path.scm")
 
 (define (init-java-script-lib)
   (set! *java-script-lib* (conc  (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js"))
   )