Fixed code so that failing tests pass for MULE-7024
Merge pull request #72 from mulesoft/MULE-7024-TESTS

Mule 7024 tests.