Improve reliability of scripted tests (race condition?)
Merge pull request #8 from gilt/feature/more_reliable_tests

Improve reliability of scripted tests (race condition?)