Fixes and test coverage for Issue #21