Adjusted broken tests