Some test battery improvements

 * only use 'wait' once tests poll as finished, to avoid blocking on long-running suites
 * move validation into the test proper (first iteration only)
 * speed a few test suites up a bit