Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -977,11 +977,11 @@
 			    -1)
 			   (else
 			    (get-df dirpath)))))
 	 (if (> freespc bestsize)
 	     (begin
-	       (set! best     (cons disk-num dirpath))
+	       (set! best     (cons disk-num dirpath))  ;; NOTE: different storage style!
 	       (set! bestsize freespc)))))
      (map car disks))
     (if (and best (> bestsize minsize))
 	best
 	#f))) ;; #f means no disk candidate found

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -839,20 +839,23 @@
     *toppath*))
 
 (define (get-best-disk confdat testconfig)
   (let* ((disks   (or (and testconfig (hash-table-ref/default testconfig "disks" #f))
 		      (hash-table-ref/default confdat "disks" #f)))
-	 (minspace (let ((m (configf:lookup confdat "setup" "minspace")))
-		     (string->number (or m "10000")))))
+	 (minspace   (string->number (or (configf:lookup confdat "setup" "minspace")
+                                         "10000"))))
     (if disks 
 	(let ((res (common:get-disk-with-most-free-space disks minspace))) ;; min size of 1000, seems tad dumb
 	  (if res
 	      (cdr res)
 	      (begin
 		(if (common:low-noise-print 20 "No valid disks or no disk with enough space")
 		    (debug:print-error 0 *default-log-port* "No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists and has enough space!\n    You can change minspace in the [setup] section of megatest.config. Current setting is: " minspace))
-		(exit 1)))))))
+		(exit 1))))
+        (begin
+          (debug:print-error 0 *default-log-port* "No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists and has enough space!\n    You can change minspace in the [setup] section of megatest.config. Current setting is: " minspace)
+          (exit 1)))))
 
 ;; Desired directory structure:
 ;;
 ;;  <linkdir> - <target> - <testname> -.
 ;;                                     |

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -989,10 +989,11 @@
 			   #f)))
     (if cached-dat
 	cached-dat
 	(let ((dat (hash-table-ref/default *testconfigs* test-name #f)))
 	  (if (and  dat ;; have a locally cached version
+                    (not force-create)
 		    (hash-table-ref/default dat "have fulldata" #f)) ;; marked as good data?
 	      dat
 	      ;; no cached data available
 	      (let* ((treg         (or test-registry
 				       (tests:get-all)))