MULE-6918: Add more test coverage
MULE-6918: Fix wrong indentation