CLC-2709 Fix the remaining failing specs