SOC-3430 | Fix Unit tests failed