[CLC-2506] Fixed implementation with tests