Fix tests

Trying to fix.

Looks like some of the issues are from upstream commerce now. We'll have to check this more in deep.

@kul.pratap please use a separate MR to not break anything already working...