Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -380,11 +380,11 @@
 	      (thread-start! th1)
 	      (thread-start! th2)
 	      (thread-join! th2)
 	      (mutex-lock! m)
 	      (set! db (open-db))
-	      (let* ((testinfo (runs:get-test-info db run-id test-name (item-list->path itemdat))))
+	      (let* ((testinfo (db:get-test-info db run-id test-name (item-list->path itemdat))))
 		(if (not (equal? (db:test-get-state testinfo) "COMPLETED"))
 		    (begin
 		      (print "Test NOT logged as COMPLETED, (state=" (db:test-get-state testinfo) "), updating result")
 		      (test-set-status! db run-id test-name
 					(if kill-job? "KILLED" "COMPLETED")

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -99,11 +99,11 @@
 (define (teststep-set-status! db run-id test-name teststep-name state-in status-in itemdat comment)
   ;; (print "run-id: " run-id " test-name: " test-name)
   (let* ((state     (check-valid-items "state" state-in))
 	 (status    (check-valid-items "status" status-in))
 	 (item-path (item-list->path itemdat))
-	 (testdat   (runs:get-test-info db run-id test-name item-path)))
+	 (testdat   (db:get-test-info db run-id test-name item-path)))
     ;; (print "testdat: " testdat)
     (if (and testdat ;; if the section exists then force specification BUG, I don't like how this works.
 	     (or (not state)(not status)))
 	(print "WARNING: Invalid " (if status "status" "state")
 	       " value \"" (if status status-in state-in) "\", update your validstates section in megatest.config"))
@@ -114,11 +114,11 @@
 			test-id teststep-name state status (if comment comment "")))
 	(print "ERROR: Can't update " test-name " for run " run-id " -> no such test in db"))))
 
 (define (test-get-kill-request db run-id test-name itemdat)
   (let* ((item-path (item-list->path itemdat))
-	 (testdat   (runs:get-test-info db run-id test-name item-path)))
+	 (testdat   (db:get-test-info db run-id test-name item-path)))
     (equal? (test:get-state testdat) "KILLREQ")))
 
 (define (test-set-meta-info db run-id testname itemdat)
   (let ((item-path (item-list->path itemdat))
 	(cpuload  (get-cpu-load))

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -1,10 +1,12 @@
 # run some tests
 
+MEGATEST=$(shell realpath ../megatest)
+
 runall :
 	cd ../;make 
-	../megatest -runall :sysname ubuntu :fsname nfs :datapath none :runname `date +%GWW%V.%u` -m "This is a comment specific to a run"
+	$(MEGATEST) -runall :sysname ubuntu :fsname nfs :datapath none :runname `date +%GWW%V.%u` -m "This is a comment specific to a run"
 
 test :
 	cd ../;make test
 	make runall
 

Index: tests/megatest.config
==================================================================
--- tests/megatest.config
+++ tests/megatest.config
@@ -2,12 +2,12 @@
 sysname TEXT
 fsname TEXT
 datapath TEXT
 
 [setup]
-executable /home/matt/data/megatest/megatest
-max_concurrent_jobs 3
+# executable /home/matt/data/megatest/megatest
+max_concurrent_jobs 5
 
 [jobtools]
 # ## launcher launches jobs, the job is managed on the target host
 ## by megatest, comment out launcher to run local
 # workhosts localhost hermes

Index: tests/tests/sqlitespeed/runscript.rb
==================================================================
--- tests/tests/sqlitespeed/runscript.rb
+++ tests/tests/sqlitespeed/runscript.rb
@@ -1,6 +1,6 @@
-#! /usr/bin/ruby
+#! /usr/bin/env ruby
 
 require "#{ENV['MT_RUN_AREA_HOME']}/supportfiles/ruby/librunscript.rb"
 
 # run_record(stepname, cmd) - will record in db if exit code of script was zero or not
 run_and_record('create db',"sqlite3 testing.db << EOF\ncreate table if not exists blah(id INTEGER PRIMARY KEY,name TEXT);\n.q\nEOF","")