Fixed test errors