CLC-2512 Fix failing test