Test fixes

I wanted to add a `wait_for_updates(count)` method but the code started looking horribly complex, so for now I've just upped the sleep times and used different service names so there is no chance of crossover.

If we continue to get failed builds I will revisit this.

Closes #15