fix for timing failures

some tests fail because we have not transitioned into a state fast enough
or we have gone out of a state too fast (backfilling).  results in
false negatives