SOC-4401 | Resolved the UT