Progress: attempting to fix race condition in tests