adjusting tests to remove race condition