Test coverage for pull request #18