MULE-7800: Fixing flaky tests
Merge pull request #997 from mulesoft/MULE-7800

MULE-7800: Fixing flaky tests