CLC-2576 Fix test failures