Fix tests according to UI changes