Use polling to speed up the tests

[DannyRyman]

Use polling to avoid unnecessary waiting time on the test. Running locally, the tests now take 10 seconds, down from 30 seconds.