Fixed test errors
Fixed test errors