NH3567 - Unit test (from JIRA reporter) and fix

Attempted fix for NH3567