Fixed test  errors