ISSUE=8335 fixed the unit test to go along with this
ISSUE=8335 fixing a unit test for this same issue