Fix tests following previous merge