SOC-4233: Add missed changes needed by the testcase