Fix tests after update