Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -89,11 +89,13 @@
 		       (idb)
 		       idb)
 		   (open-db)))
 	 (res #f))
     (set! res (apply proc db params))
-    (if (not idb)(sqlite3:finalize! db))
+    (if (or (not idb)
+	    (procedure? idb))
+	(sqlite3:finalize! db))
     (debug:print-info 11 "open-run-close-no-exception-handling END" )
     res))
 
 (define (open-run-close-exception-handling proc idb . params)
   (handle-exceptions

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -8,11 +8,11 @@
 ;;  PURPOSE.
 
 ;; (include "common.scm")
 ;; (include "megatest-version.scm")
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos json) ;; (srfi 18) extras)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos json http-client) ;; (srfi 18) extras)
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
 
 ;; (use zmq)
 
@@ -1059,10 +1059,11 @@
 
 ;; this is the socket if we are a client
 ;; (if (and *runremote*
 ;; 	 (socket? *runremote*))
 ;;     (close-socket *runremote*))
+(close-all-connections!)
 
 (if (not *didsomething*)
     (debug:print 0 help))
 
 ;; (if *runremote* (rpc:close-all-connections!))

Index: tests/fdktestqa/testqa/megatest.config
==================================================================
--- tests/fdktestqa/testqa/megatest.config
+++ tests/fdktestqa/testqa/megatest.config
@@ -3,6 +3,6 @@
 # runqueue 2
 
 [include ../fdk.config]
 
 [server]
-timeout 0.01
+timeout 0.06