MULE-7851: Fixing broken tests