Fixed test routines