Fixed more async tests for race conditions