SOC-4401 | Fix bugs on functional checking.