Issue #222: Increase test coverage.