CLC-3178 - Fix tests
Merge pull request #2107 from redconfetti/CLC-3178-test-hotfix

CLC-3178 - Fix tests