Merge pull request #1198 from mulesoft/MULE-8028

MULE-8028 - fix broken test cases
(cherry picked from commit 5bc1d1079faecf5aa78ea2fafdbe4f61271dc9ce)