CLC-4025 Fix failing tests