@@ -2626,11 +2626,11 @@
 	      db
 	      ;; (db:get-cache-stmth dbdat db
 	      ;; 		    (conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id=? AND run_id=?;"))
 	      (conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id=? AND run_id=?;")
 	      test-id run-id)
-	     (hash-table-set! *db:get-test-info-by-id-cache* hash-key res)
+	     (hash-table-set! *db:get-test-info-by-id-cache* hash-key (cons (current-seconds) res))
 	     res))))))
 
 (define *db:get-test-state-status-by-id-cache* (make-hash-table))
 
 ;; Get test state, status using test_id
@@ -3150,11 +3150,11 @@
                db
                (lambda ()
                  ;; NB// Pass the db so it is part fo the transaction
                  (db:test-set-state-status-db db run-id test-id state status comment) ;; this call sets the item state/status
                  (if (not (equal? item-path "")) ;; only roll up IF incoming test is an item
-                     (let* ((state-status-counts (db:get-all-state-status-counts-for-test db run-id test-name item-path state status)) ;; item-path is used to exclude current state/status of THIS test
+                     (let* ((state-status-counts (db:get-all-state-status-counts-for-test-db db run-id test-name item-path state status)) ;; item-path is used to exclude current state/status of THIS test
 			    (state-statuses      (db:roll-up-rules state-status-counts state status))
                             (newstate            (car state-statuses))
                             (newstatus           (cadr state-statuses)))
 		       (set! new-state-eh newstate)
 		       (set! new-status-eh newstatus)
@@ -3264,15 +3264,20 @@
   (db:with-db
    dbstruct #f #f
    (lambda (dbdat db)
      (db:get-all-state-status-counts-for-run-db dbdat db run-id))))
 
-;; BBnote: db:get-all-state-status-counts-for-test returns dbr:counts object aggregating state and status of items of a given test, *not including rollup state/status*
+(define (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path item-state-in item-status-in)
+  (db:with-db
+   dbstruct run-id #f
+   (lambda (dbdat db)
+     (db:get-all-state-status-counts-for-test-db db run-id test-name item-path item-state-in item-status-in))))
+     ;; BBnote: db:get-all-state-status-counts-for-test returns dbr:counts object aggregating state and status of items of a given test, *not including rollup state/status*
 ;;
 ;; NOTE: This is called within a transaction
 ;;
-(define (db:get-all-state-status-counts-for-test db run-id test-name item-path item-state-in item-status-in)
+(define (db:get-all-state-status-counts-for-test-db db run-id test-name item-path item-state-in item-status-in)
   (let* ((test-info   (db:get-test-info-db db run-id test-name item-path))
          (item-state  (or item-state-in (db:test-get-state test-info))) 
          (item-status (or item-status-in (db:test-get-status test-info)))
          (other-items-count-recs (sqlite3:map-row
                                   (lambda (state status count)