Fixed test after last merge