@@ -1012,11 +1012,11 @@
 		(let ((id (db:test-id        trec))
 		      (tn (db:test-testname  trec))
 		      (ip (db:test-item-path trec))
 		      (st (db:test-state     trec)))
 		  (if (not (equal? st "DELETED"))
-		      (hash-table-set! test-registry (db:test-make-full-name tn ip) (string->symbol st)))))
+		      (hash-table-set! test-registry (db:test-make-full-name tn ip) (string->symbol (or st "#F=>BAD DATA"))))))
 	      tests-info)
     (set! max-retries (if (and max-retries (string->number max-retries))(string->number max-retries) 100))
 
     (let loop ((hed         (car sorted-test-names))
 	       (tal         (cdr sorted-test-names))
@@ -1155,15 +1155,14 @@
 					   " ")
 					  "\n"))
 				  items)))
 	  (for-each
 	   (lambda (my-itemdat)
-	     (let* ((new-test-record (let ((newrec (make-tests:testqueue)))
-				       (vector-copy! test-record newrec)
-				       newrec))
-		    (my-item-path (item-list->path my-itemdat)))
-	       (if (tests:match test-patts hed my-item-path required: required-tests) ;; (patt-list-match my-item-path item-patts)           ;; yes, we want to process this item, NOTE: Should not need this check here!
+	     (let* ((new-test-record (make-tests:testqueue))
+				     ;;  (update-tests:testqueue test-record)))
+		    (my-item-path    (item-list->path my-itemdat)))
+	     (if (tests:match test-patts hed my-item-path required: required-tests) ;; (patt-list-match my-item-path item-patts)           ;; yes, we want to process this item, NOTE: Should not need this check here!
 		   (let ((newtestname (db:test-make-full-name hed my-item-path)))    ;; test names are unique on testname/item-path
 		     (tests:testqueue-set-items!     new-test-record #f)
 		     (tests:testqueue-set-itemdat!   new-test-record my-itemdat)
 		     (tests:testqueue-set-item_path! new-test-record my-item-path)
 		     (hash-table-set! test-records newtestname new-test-record)