MULE-6918: Add more test coverage