Fix tests after recent changes