Fixed test classes