Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -40,11 +40,11 @@
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "js-path.scm")
 
-(use stml2)
+(require-library stml)
 (define (http-transport:make-server-url hostport)
   (if (not hostport)
       #f
       (conc "http://" (car hostport) ":" (cadr hostport))))
 

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -793,30 +793,46 @@
 			     (tal    (cdr not-completed-tests)))
 		       (let* ((test-name (vector-ref running-test 2))
                  (item-path (vector-ref running-test 11)))
 			       	(debug:print 0 *default-log-port* "test " test-name "/" item-path " not completed")
               (if (not (null? tal))
-				  (loop (car tal) (cdr tal)))))))))))        
- 
-(define (launch:is-test-alive host pid)
+		  (loop (car tal) (cdr tal)))))))))))
+
+;; replaced below with version that does not ssh if checking on localhost
+#;(define (launch:is-test-alive host pid)
   (if (and host pid (not (equal? host "n/a")))
       (let* ((cmd (conc "ssh " host " pstree -A " pid))
 	     (output (with-input-from-pipe cmd read-lines)))
 	(debug:print 2 *default-log-port* "Running " cmd " received " output)
 	(if (eq? (length output) 0)
 	   #f
 	   #t))
       #t))
- 
+
+(define (launch:is-test-alive host pid)
+  (let* ((same-host (equal? host (get-host-name)))
+	 (cmd (conc 
+	       (if same-host "" (conc "ssh "host" "))
+	       "pstree -A "pid)))
+    (if (and host pid
+	     (not (equal? host "n/a")))
+	
+	(let* ((output (with-input-from-pipe cmd read-lines)))
+	  (debug:print 2 *default-log-port* "Running " cmd " received " output)
+	  (if (eq? (length output) 0)
+	      #f
+	      #t))
+	#t))) ;; assuming bad query is about a live test is likely not the right thing to do?
+
 (define (launch:kill-tests-if-dead run-id)
   (let* ((running-tests (rmt:get-tests-for-run run-id "%" `("RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
        (let loop ((running-test (car running-tests))
 			     (tal    (cdr running-tests))
 			     (kill-cnt 0))
 		       (let* ((test-name (vector-ref running-test 2))
                  (item-path (vector-ref running-test 11))
-								 (test-id (vector-ref running-test 0))
+		 (test-id (vector-ref running-test 0))
                  (host (vector-ref running-test 6))
                  (pid  (rmt:test-get-top-process-pid run-id test-id))   
                  (event-time (vector-ref running-test 5))
                  (duration (vector-ref running-test 12))
                  (flag 0)   

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -35,11 +35,11 @@
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 
-(use stml2)
+(require-library stml)
 
 ;; stuff for the mapper and checker functions
 ;;
 (define *target-mappers*  (make-hash-table)) 
 (define *runname-mappers* (make-hash-table)) 

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -34,11 +34,11 @@
 (declare (uses server))
 ;;(declare (uses stml2))
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
 (import (prefix sqlite3 sqlite3:))
-(use stml2)
+(require-library stml)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")