fix broken tests after 4.1 update