Fixed test codes