Fixed test classes.