Fix tests after commit eaad27335dd00eb917e38e39b219278783749a33