Remove test race condition