Fixed test broken in merge