For scommerce spec fixes