Fixed test naming conventions