Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -2149,17 +2149,24 @@
 		  (set! ever-seen #t)
 		  (cond
 		   ;; case 1, non-item (parent test) is 
 		   ((and (equal? item-path "") ;; this is the parent test
 			 is-completed
-			 (or is-ok (eq? mode 'toplevel)))
+			 (or is-ok (member mode '(toplevel itemmatch))))
 		    (set! parent-waiton-met #t))
-		   ((and same-itempath
-			 is-completed
-			 (or is-ok (eq? mode 'toplevel)))
+		   ((or (and (not same-itempath)
+			     (eq? mode 'itemmatch))  ;; in itemmatch mode we look only at the same itempath
+			(and same-itempath
+			     is-completed
+			     (or is-ok 
+				 (eq? mode 'toplevel)              ;; toplevel does not block on FAIL
+				 (and is-ok (eq? mode 'itemmatch)) ;; itemmatch blocks on not ok
+				 )))
 		    (set! item-waiton-met #t)))))
 	      tests)
+             ;; both requirements, parent and item-waiton must be met to NOT add item to
+             ;; prereq's not met list
 	     (if (not (or parent-waiton-met item-waiton-met))
 		 (set! result (append (if (null? tests) (list waitontest-name) tests) result)))
 	     ;; if the test is not found then clearly the waiton is not met...
 	     ;; (if (not ever-seen)(set! result (cons waitontest-name result)))))
 	     (if (not ever-seen)

Index: tests/fdktestqa/testqa/tests/bigrun/step1.sh
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun/step1.sh
+++ tests/fdktestqa/testqa/tests/bigrun/step1.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 if [ $NUMBER -lt 200 ];then 
+   sleep 20
    sleep $NUMBER
 else
    sleep 200
 fi
 

Index: tests/fdktestqa/testqa/tests/bigrun/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun/testconfig
+++ tests/fdktestqa/testqa/tests/bigrun/testconfig
@@ -7,11 +7,11 @@
 # waiton setup
 priority 0
 
 # Iteration for your tests are controlled by the items section
 [items]
-NUMBER #{scheme (string-intersperse (map number->string (sort (let loop ((a 0)(res '()))(if (<= a (or (any->number (get-environment-variable "NUMTESTS")) 2500))(loop (+ a 1)(cons a res)) res)) >)) " ")}
+NUMBER #{scheme (string-intersperse (map number->string (sort (let loop ((a 0)(res '()))(if (<= a (or (any->number (get-environment-variable "NUMTESTS")) 2500))(loop (+ a 1)(cons a res)) res)) <)) " ")}
 
 # test_meta is a section for storing additional data on your test
 [test_meta]
 author matt
 owner  matt

Index: tests/fdktestqa/testqa/tests/bigrun2/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun2/testconfig
+++ tests/fdktestqa/testqa/tests/bigrun2/testconfig
@@ -2,18 +2,18 @@
 [ezsteps]
 step1 step1.sh
 
 # Test requirements are specified here
 [requirements]
-# waiton bigrun
+waiton bigrun
 priority 0
 mode itemmatch
 
 
 # Iteration for your tests are controlled by the items section
 [items]
-NUMBER #{scheme (string-intersperse (map number->string (sort (let loop ((a 0)(res '()))(if (< a 1500)(loop (+ a 1)(cons a res)) res)) >)) " ")}
+NUMBER #{scheme (string-intersperse (map number->string (sort (let loop ((a 0)(res '()))(if (<= a (or (any->number (get-environment-variable "NUMTESTS")) 2500))(loop (+ a 1)(cons a res)) res)) <)) " ")}
 
 # test_meta is a section for storing additional data on your test
 [test_meta]
 author matt
 owner  matt