CLC-3178 - Fix tests