test: Make job event waiting more explicit

Signed-off-by: Lewis Marshall <lewis@lmars.net>
Merge pull request #498 from flynn/refactor-job-event-waiting

test: Make job event waiting more explicit