Broken tests after upgrading to 4.1