CLC-4390: fix two broken tests
Merge pull request #3094 from pfarestveit/test-fixes

CLC-4390: fix two broken tests