Adds test coverage for PR #82