Repair some tests after last changes.