Improve async usage in tests.
Merge pull request #78 from leftclickben/ReviewAsyncInTests

Improve async usage in tests.