Merge pull request #694 from nulltoken/topic/mergebase-test-coverage mergebase: enhance test code coverage