Test cases for pull-request #1516.
When in Rome…