MULE-7572 Revert change made in fbce0106af13818c6bb813301bee24ed75ce2e69 and fix test method
Merge pull request #679 from mulesoft/MULE-7569

MULE-7572 Revert change made in fbce0106af13818c6bb813301bee24ed75ce2e69...