Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1869,11 +1869,11 @@
 	   (member status '("PASS" "WARN" "FAIL" "WAIVED" "RUNNING" "CHECK" "SKIP")))
       (let ((db (db:get-db dbstruct run-id)))
 	(db:general-call db 'update-pass-fail-counts (list test-name test-name test-name))
 	(if (equal? status "RUNNING")
 	    (db:general-call db 'top-test-set-running (list test-name))
-	    (db:general-call db 'top-test-set-per-pf-counts (list test-name test-name test-name)))
+	    (db:general-call db 'top-test-set-per-pf-counts (list test-name run-id test-name test-name test-name)))
 	#f)
       #f))
 
 (define (db:tests-register-test dbstruct run-id test-name item-path)
   (sqlite3:execute (db:get-db dbstruct run-id) 'register-test run-id test-name item-path))

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -58,11 +58,11 @@
 	@echo Run all_toplevel and all waitons
 	cd fullrun;$(MEGATEST) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_c
 
 test4 : cleanprep
 	@echo "WARNING: No longer running fullprep, test converage may be lessened"
-	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -preclean -runtests % -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
+	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -runtests % -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
 
 test4a : cleanprep
 	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
 
 # NOTE: Only one instance can be a server

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -121,11 +121,11 @@
 port 8080
 
 # This server will keep running this number of hours after last access. 
 # Three minutes is 0.05 hours
 # timeout 0.025
-timeout 0.5
+timeout 0.01
 
 ## disks are:
 ## name host:/path/to/area
 ## -or-
 ## name /path/to/area

Index: utils/loadrunner
==================================================================
--- utils/loadrunner
+++ utils/loadrunner
@@ -62,16 +62,17 @@
     # echo "Load acceptable: lperc=$lperc %, max_load=$max_load %, load=$load, numcpu=$numcpu, MAX_ALLOWED_LOAD=$MAX_ALLOWED_LOAD % and $lperc2 < $lperc"
     # echo "Starting command: \"$@\""
     launchjob "$@"
     # we sleep ten seconds here to keep the lock a little longer and give time for
     # the uptime to show a response
-    sleep 10
+    # sleep 2
   else
    echo "$LOADRUNNER $@" | at now + 2 minutes &> /dev/null
+   # sleep 5
   fi
 else
   # echo "Load too high: lperc=$lperc, max_load=$max_load, waiting two minutes before trying to run command: \"$@\""
   echo "$LOADRUNNER $@" | at now + 2 minutes &> /dev/null
 fi
 
-sleep $(get_delay_time 10)
+sleep $(get_delay_time 3)
 rm -f $lfile