Fix test failing after last changes