MULE-8030: Fixing broken tests
Merge pull request #1153 from mulesoft/MULE-8030

MULE-8030: Fixing broken tests