Small tweaks to get rid of race conditions in the tests.
Merge pull request #25 from mozilla-services/fix-test-races

Small tweaks to get rid of race conditions in the tests.