remove race in tests