Dileep/Yogesh | 2750 | Fixed test failures