MULE-7851: Fixing broken tests
Merge pull request #965 from mulesoft/MULE-7851

MULE-7851: Fixing broken tests