Fixed test methods