Fix for ENYO-3128 #2

False positive on result from initial fix. Rehashed requirement and added unit test.