[CLC-1389] Fixing tests