Merge pull request #156 from briancroom/fix-flaky-test

Fix race condition in an async test which was triggering failures (SR-2332)