[CLC-1235] Test fixes