MULE-6918: Add more test coverage

Added more Unit and Functional test coverage as requested in previous pull request.