Make some of the tests poll rather than sleep
Merge pull request #1 from RichardVickerstaff/master

Make some of the tests poll rather than sleep