Create test targeting BZ 1112717

The two commit messages detail the changes in this PR pretty well. This PR has been created in response to issue #1129.