Fixed test issues after merge