@@ -267,11 +267,11 @@
 	  (debug:print 4 lin)
 	  (tdb:csv->test-data test-id lin work-area: work-area)
 	  (loop (read-line)))))
   ;; roll up the current results.
   ;; FIXME: Add the status to 
-  (tdb:test-data-rollup db test-id #f work-area: work-area))
+  (tdb:test-data-rollup test-id #f work-area: work-area))
 
 ;; WARNING: Do NOT call this for the parent test on an iterated test
 ;; Roll up test_data pass/fail results
 ;; look at the test_data status field, 
 ;;    if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS.
@@ -288,11 +288,10 @@
 	     (set! pass-count pcount))
 	   tdb 
 	   "SELECT (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'fail') AS fail_count,
                    (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'pass') AS pass_count;"
 	   test-id test-id)
-	  (sqlite3:finalize! tdb)
 
 	  ;; Now rollup the counts to the central megatest.db
 	  (rmt:general-call 'pass-fail-counts fail-count pass-count test-id)
 	  ;; (sqlite3:execute db "UPDATE tests SET fail_count=?,pass_count=? WHERE id=?;" 
 	  ;;                     fail-count pass-count test-id)
@@ -302,11 +301,11 @@
 	  ;;
 	  ;; (cdb:flush-queue *runremote*)
 	  ;; (thread-sleep! 1) ;; play nice with the queue by ensuring the rollup is at least 10ms later than the set
 	  
 	  ;; if the test is not FAIL then set status based on the fail and pass counts.
-	  (rmt:general-call 'test-rollup-test_data-pass-fail test-id)
+	  (rmt:general-call 'test_data-pf-rollup test-id test-id test-id test-id)
 	  ;; (sqlite3:execute
 	  ;;  db   ;;; NOTE: Should this be WARN,FAIL? A WARN is not a FAIL????? BUG FIXME
 	  ;;  "UPDATE tests
 	  ;;             SET status=CASE WHEN (SELECT fail_count FROM tests WHERE id=?) > 0 
 	  ;;                THEN 'FAIL'
@@ -314,10 +313,11 @@
 	  ;;                  (SELECT status FROM tests WHERE id=?) NOT IN ('WARN','FAIL')
 	  ;;             THEN 'PASS'
 	  ;;             ELSE status
 	  ;;         END WHERE id=?;"
 	  ;;  test-id test-id test-id test-id)
+	  (sqlite3:finalize! tdb)
 	  ))))
 
 (define (tdb:get-prev-tol-for-test tdb test-id category variable)
   ;; Finish me?
   (values #f #f #f))