Cart and Order test fixes