Handle asynchronicity correctly
Merge pull request #153 from unepwcmc/fix-tests-on-slow-machines

Make tests work on slow machines