CLC-3291 Fix failing tests