Merge "Fix IT tests as per as API change in SFC"