Fix failing test
Merge pull request #2056 from edwlook/CLC-3169-3

NOJIRA - Fix failing test