Fixed test conflict