Increase sleeps in tests

This is a temporary fix, we should really be waiting for the correct
number of updates

Signed-off-by: Lewis Marshall <lewis@lmars.net>
Use different service names in tests

Signed-off-by: Lewis Marshall <lewis@lmars.net>
Merge pull request #16 from flynn/test-fixes

Test fixes