[Bug #8564] Unit test for pull request #95