@@ -468,11 +468,11 @@
 		  (print x))
 		targets)
       (set! *didsomething* #t)))
 
 (define (full-runconfigs-read)
-  (let* ((keys   (cdb:remote-run db:get-keys #f))
+  (let* ((keys   (rmt:get-keys))
 	 (target (if (args:get-arg "-reqtarg")
 		     (args:get-arg "-reqtarg")
 		     (if (args:get-arg "-target")
 			 (args:get-arg "-target")
 			 #f)))
@@ -573,22 +573,24 @@
 
 ;;======================================================================
 ;; Query runs
 ;;======================================================================
 
+;; NOTE: list-runs and list-db-targets operate on local db!!!
+;;
 (if (or (args:get-arg "-list-runs")
 	(args:get-arg "-list-db-targets"))
     (if (setup-for-run)
-	(let* ((db       #f)
+	(let* ((db       (open-db))
 	       (runpatt  (args:get-arg "-list-runs"))
 	       (testpatt (if (args:get-arg "-testpatt") 
 			     (args:get-arg "-testpatt") 
 			     "%"))
-	       (runsdat  (cdb:remote-run db:get-runs #f runpatt #f #f '()))
+	       (runsdat  (db:get-runs db runpatt #f #f '()))
 	       (runs     (db:get-rows runsdat))
 	       (header   (db:get-header runsdat))
-	       (keys     (cdb:remote-run db:get-keys #f))
+	       (keys     (db:get-keys db))
 	       (db-targets (args:get-arg "-list-db-targets"))
 	       (seen     (make-hash-table)))
 	  ;; Each run
 	  (for-each 
 	   (lambda (run)
@@ -601,11 +603,12 @@
 			 (hash-table-set! seen targetstr #t)
 			 ;; (print "[" targetstr "]"))))
 			 (print targetstr))))
 	       (if (not db-targets)
 		   (let* ((run-id (db:get-value-by-header run header "id"))
-			  (tests  (mt:get-tests-for-run run-id testpatt '() '())))
+			  (tests  (db:get-tests-for-run db run-id testpatt '() '() #f #f #f 'testname 'asc #f)))
+		     ;; (db:get-tests-for-run db run-id testpatt '() '())))
 		     (print "Run: " targetstr "/" (db:get-value-by-header run header "runname") 
 			    " status: " (db:get-value-by-header run header "state")
 			    " run-id: " run-id ", number tests: " (length tests))
 		     (for-each 
 		      (lambda (test)
@@ -622,18 +625,18 @@
 				(db:test-get-host test))
 			(if (not (or (equal? (db:test-get-status test) "PASS")
 				     (equal? (db:test-get-status test) "WARN")
 				     (equal? (db:test-get-state test)  "NOT_STARTED")))
 			    (begin
-			      (print "         cpuload:  " (db:test-get-cpuload test)
+			      (print   "         cpuload:  " (db:test-get-cpuload test)
 				     "\n         diskfree: " (db:test-get-diskfree test)
 				     "\n         uname:    " (db:test-get-uname test)
 				     "\n         rundir:   " (db:test-get-rundir test)
 				     )
 			      ;; Each test
 			      ;; DO NOT remote run
-			      (let ((steps (db:get-steps-for-test #f (db:test-get-id test))))
+			      (let ((steps (db:get-steps-for-test db (db:test-get-id test))))
 				(for-each 
 				 (lambda (step)
 				   (format #t 
 					   "    Step: ~20a State: ~10a Status: ~10a Time ~22a\n"
 					   (db:step-get-stepname step)