[CDE-252]: Fixed Unit Tests for ci build