Support for issue #21 and more unit-test updates to increase coverage.