Fix commerce creation
Fix commerce creation and add specs