Fixed test issues