Continue to fix race condition in the test suite