Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -98,19 +98,19 @@
 					      run-id 
 					      (tasks:hostinfo-get-interface server-dat)
 					      (tasks:hostinfo-get-port      server-dat))
 			      (thread-sleep! 2)
 			      (server:try-running run-id)
-			      (thread-sleep! 5) ;; give server a little time to start up
+			      (thread-sleep! 10) ;; give server a little time to start up
 			      (client:setup run-id remaining-tries: (- remaining-tries 1)))
 			    (begin
 			      (thread-sleep! 5)
 			      (client:setup run-id remaining-tries: (- remaining-tries 1))))))
 		  (begin    ;; no server registered
 		    (thread-sleep! 2)
 		    (server:try-running run-id)
-		    (thread-sleep! 5) ;; give server a little time to start up
+		    (thread-sleep! 10) ;; give server a little time to start up
 		    (client:setup run-id remaining-tries: (- remaining-tries 1)))))))))
 
 ;; keep this as a function to ease future 
 (define (client:start run-id server-info)
   (http-transport:client-connect run-id 

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1191,11 +1191,11 @@
 
 ;; Get run-ids for runs with same target but different runnames and NOT run-id
 ;;
 (define (db:get-prev-run-ids dbstruct run-id)
   (let* ((keyvals (rmt:get-key-val-pairs run-id))
-	 (kvalues (make cdr keyvals))
+	 (kvalues (cdr keyvals))
 	 (keys    (rmt:get-keys))
 	 (qrystr  (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND ")))
     (let ((prev-run-ids '()))
       (db:with-db dbstruct #f #f ;; #f means work with the zeroth db - i.e. the runs db
        (lambda ()
@@ -1683,30 +1683,31 @@
 
 ;;======================================================================
 ;; Misc. test related queries
 ;;======================================================================
 
-(define (db:get-run-ids-matching-target dbstruct keynames target res testpatt statepatt statuspatt)
+(define (db:get-run-ids-matching-target dbstruct keynames target res runname testpatt statepatt statuspatt)
   (let* ((row-ids '())
 	 (keystr (string-intersperse 
 		  (map (lambda (key val)
 			 (conc key " like '" val "'"))
 		       keynames 
 		       (string-split target "/"))
 		  " AND "))
-	 (testqry (tests:match->sqlqry testpatt))
+	 ;; (testqry (tests:match->sqlqry testpatt))
 	 (runsqry (sqlite3:prepare (db:get-db dbstruct #f)(conc "SELECT id FROM runs WHERE " keystr " AND runname LIKE '" runname "';"))))
-    (debug:print 8 "db:test-get-paths-matching-keynames-target-new\n  runsqry=" runsqry "\n  tstsqry=" tstsqry)
+    ;; (debug:print 8 "db:test-get-paths-matching-keynames-target-new\n  runsqry=" runsqry "\n  tstsqry=" testqry)
     (sqlite3:for-each-row
      (lambda (rid)
        (set! row-ids (cons rid row-ids)))
      runsqry)
     (sqlite3:finalize! runsqry)
     row-ids))
 
 (define (db:test-get-paths-matching-keynames-target-new dbstruct run-id keynames target res testpatt statepatt statuspatt runname)
-  (let ((tstsqry (conc "SELECT rundir FROM tests WHERE " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;")))
+  (let* ((testqry (tests:match->sqlqry testpatt))
+	 (tstsqry (conc "SELECT rundir FROM tests WHERE " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;")))
     (sqlite3:for-each-row 
      (lambda (p)
        (set! res (cons p res)))
      (db:get-db dbstruct run-id)
      tstsqry)

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -200,20 +200,21 @@
   (rmt:send-receive 'get-testinfo-state-status run-id (list run-id test-id)))
 
 (define (rmt:test-set-log! run-id test-id logf)
   (if (string? logf)(rmt:general-call 'test-set-log run-id logf test-id)))
 
-(define (rmt:get-run-ids-matching-target keynames target res testpatt statepatt statuspatt)
-  (rmt:send-receive 'get-run-ids-matching-target #f (list keynames target res testpatt statepatt statuspatt)))
+(define (rmt:get-run-ids-matching-target keynames target res runname testpatt statepatt statuspatt)
+  (rmt:send-receive 'get-run-ids-matching-target #f (list keynames target res runname testpatt statepatt statuspatt)))
 
 ;; NOTE: This will open and access ALL run databases. 
 ;;
 (define (rmt:test-get-paths-matching-keynames-target-new keynames target res testpatt statepatt statuspatt runname)
-  (let ((run-ids (rmt:get-run-ids-matching-target keynames target res testpatt statepatt statuspatt)))
-    (apply append (lambda (run-id)
-		    (rmt:send-receive 'test-get-paths-matching-keynames-target-new run-id (list keynames target res testpatt statepatt statuspatt runname)))
-	   run-ids)))
+  (let ((run-ids (rmt:get-run-ids-matching-target keynames target res runname testpatt statepatt statuspatt)))
+    (apply append 
+	   (map (lambda (run-id)
+		  (rmt:send-receive 'test-get-paths-matching-keynames-target-new run-id (list run-id keynames target res testpatt statepatt statuspatt runname)))
+	   run-ids))))
 
 (define (rmt:get-run-ids-matching keynames target res)
   (rmt:send-receive #f 'get-run-ids-matching (list keynames target res)))
 
 (define (rmt:get-prereqs-not-met run-id waitons ref-item-path #!key (mode 'normal))

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -108,11 +108,11 @@
 ;; > file 2>&1 
 (define (server:try-running run-id)
   (let* ((rand-name (random 100))
 	 (cmdln (conc (if (getenv "MT_MEGATEST") (getenv "MT_MEGATEST") "megatest")
 		    ;; " -server - -run-id " run-id " name=" rand-name " > " *toppath* "/db/" run-id "-" rand-name ".log 2>&1 &")))
-		      " -server - -run-id " run-id " > " *toppath* "/db/" run-id ".log 2>&1 &")))
+		      " -server - -run-id " run-id " >> " *toppath* "/db/" run-id ".log 2>&1 &")))
     (debug:print 0 "INFO: Starting server (" cmdln ") as none running ...")
     (push-directory *toppath*)
     (system cmdln)
     (pop-directory)))
 

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -128,11 +128,11 @@
      "SELECT count(id) FROM servers WHERE run_id=?;"
      run-id)
     res))
 
 (define (tasks:server-clean-out-old-records-for-run-id mdb run-id)
-  (sqlite3:execute mdb "DELETE FROM servers WHERE state in ('available','shutting-down') AND (strftime('%s','now') - start_time) > 10 AND run_id=?;" run-id))
+  (sqlite3:execute mdb "DELETE FROM servers WHERE state in ('available','shutting-down') AND (strftime('%s','now') - start_time) > 30 AND run_id=?;" run-id))
 
 (define (tasks:server-force-clean-running-records-for-run-id mdb run-id)
   (sqlite3:execute mdb "DELETE FROM servers WHERE state = 'running' AND run_id=?;" run-id))
 
 (define (tasks:server-force-clean-run-record mdb run-id iface port)

Index: tests/fdktestqa/fdk.config
==================================================================
--- tests/fdktestqa/fdk.config
+++ tests/fdktestqa/fdk.config
@@ -2,11 +2,11 @@
 SYSTEM TEXT
 RELEASE TEXT
 
 [setup]
 # Adjust max_concurrent_jobs to limit how much you load your machines
-max_concurrent_jobs 150
+max_concurrent_jobs 500
 
 # This is your link path, you can move it but it is generally better to keep it stable
 linktree #{shell readlink -f #{getenv PWD}/../simplelinks}
 
 [include testqa/configs/megatest.abc.config]

Index: tests/fdktestqa/testqa/Makefile
==================================================================
--- tests/fdktestqa/testqa/Makefile
+++ tests/fdktestqa/testqa/Makefile
@@ -24,6 +24,6 @@
 compile :
 	$(MEGATEST) -stop-server 0
 	(cd ../../..;make && make install)
 
 clean :
-	rm -rf ../simple*/*/* megatest.db
+	rm -rf ../simple*/*/* megatest.db db/*

Index: tests/fdktestqa/testqa/megatest.config
==================================================================
--- tests/fdktestqa/testqa/megatest.config
+++ tests/fdktestqa/testqa/megatest.config
@@ -2,9 +2,12 @@
 testcopycmd cp --remove-destination -rlv TEST_SRC_PATH/. TEST_TARG_PATH/. >> TEST_TARG_PATH/mt_launch.log 2>> TEST_TARG_PATH/mt_launch.log
 runqueue 20
 transport http
 launchwait no
 
+[jobtools]
+launcher loadrunner
+
 [include ../fdk.config]
 
 [server]
 port 9080