Issue127 unit test coverage

This pull request fixes some unit test result deviations. This is required for running the unit tests on other pull requests.