Fixed test helper