diff --git a/spec/controllers/admin/order_cycles_controller_spec.rb b/spec/controllers/admin/order_cycles_controller_spec.rb
index 0175cc1d28..a12b644f2c 100644
--- a/spec/controllers/admin/order_cycles_controller_spec.rb
+++ b/spec/controllers/admin/order_cycles_controller_spec.rb
@@ -2,9 +2,7 @@ require 'spec_helper'
 
 module Admin
   describe OrderCyclesController, type: :controller do
-    include AuthenticationWorkflow
-
-    let!(:distributor_owner) { create_enterprise_user enterprise_limit: 2 }
+    let!(:distributor_owner) { create(:user) }
 
     before do
       allow(controller).to receive_messages spree_current_user: distributor_owner
@@ -300,7 +298,7 @@ module Admin
     end
 
     describe "notifying producers" do
-      let(:user) { create_enterprise_user }
+      let(:user) { create(:user) }
       let(:admin_user) do
         user = create(:user)
         user.spree_roles << Spree::Role.find_or_create_by!(name: 'admin')
diff --git a/spec/controllers/api/enterprises_controller_spec.rb b/spec/controllers/api/enterprises_controller_spec.rb
index b6e42967dc..0a2a185b72 100644
--- a/spec/controllers/api/enterprises_controller_spec.rb
+++ b/spec/controllers/api/enterprises_controller_spec.rb
@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe Api::EnterprisesController, type: :controller do
-  include AuthenticationWorkflow
   render_views
 
   let(:enterprise) { create(:distributor_enterprise) }
 
   context "as an enterprise owner" do
-    let(:enterprise_owner) { create_enterprise_user enterprise_limit: 10 }
+    let(:enterprise_owner) { create(:user) }
     let!(:enterprise) { create(:distributor_enterprise, owner: enterprise_owner) }
 
     before do
@@ -52,7 +51,7 @@ describe Api::EnterprisesController, type: :controller do
   end
 
   context "as an enterprise manager" do
-    let(:enterprise_manager) { create_enterprise_user }
+    let(:enterprise_manager) { create(:user) }
 
     before do
       enterprise_manager.enterprise_roles.build(enterprise: enterprise).save
@@ -74,7 +73,7 @@ describe Api::EnterprisesController, type: :controller do
   end
 
   context "as an non-managing user" do
-    let(:non_managing_user) { create_enterprise_user }
+    let(:non_managing_user) { create(:user) }
 
     before do
       allow(Enterprise)
diff --git a/spec/controllers/registration_controller_spec.rb b/spec/controllers/registration_controller_spec.rb
index 31a1a91116..ea5f73c590 100644
--- a/spec/controllers/registration_controller_spec.rb
+++ b/spec/controllers/registration_controller_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RegistrationController, type: :controller do
-  include AuthenticationWorkflow
   describe "redirecting when user not logged in" do
     it "index" do
       get :index
@@ -10,7 +9,7 @@ describe RegistrationController, type: :controller do
   end
 
   describe "redirecting when user has reached enterprise ownership limit" do
-    let!(:user) { create_enterprise_user( enterprise_limit: 1 ) }
+    let!(:user) { create(:user, enterprise_limit: 1 ) }
     let!(:enterprise) { create(:distributor_enterprise, owner: user) }
 
     before do
@@ -24,7 +23,7 @@ describe RegistrationController, type: :controller do
   end
 
   describe "loading data when user is logged in" do
-    let!(:user) { create_enterprise_user }
+    let!(:user) { create(:user) }
 
     before do
       allow(controller).to receive_messages spree_current_user: user
diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb
index 5d0401c6cc..b1b7d5a05f 100644
--- a/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Spree::Admin::OrdersController, type: :controller do
-  include AuthenticationWorkflow
   include OpenFoodNetwork::EmailHelper
 
   describe "#edit" do
@@ -109,7 +108,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
   describe "#index" do
     context "as a regular user" do
-      before { allow(controller).to receive(:spree_current_user) { create_enterprise_user } }
+      before { allow(controller).to receive(:spree_current_user) { create(:user) } }
 
       it "should deny me access to the index action" do
         spree_get :index
diff --git a/spec/controllers/spree/admin/overview_controller_spec.rb b/spec/controllers/spree/admin/overview_controller_spec.rb
index e445932555..3c610b62cc 100644
--- a/spec/controllers/spree/admin/overview_controller_spec.rb
+++ b/spec/controllers/spree/admin/overview_controller_spec.rb
@@ -1,15 +1,13 @@
 require 'spec_helper'
 
 describe Spree::Admin::OverviewController, type: :controller do
-  include AuthenticationWorkflow
-
   describe "#index" do
     before do
       allow(controller).to receive(:spree_current_user).and_return(user)
     end
 
     context "when user owns only one enterprise" do
-      let(:user) { create_enterprise_user }
+      let(:user) { create(:user) }
       let!(:enterprise) { create(:distributor_enterprise, owner: user) }
 
       context "when the referer is not an admin page" do
@@ -48,7 +46,7 @@ describe Spree::Admin::OverviewController, type: :controller do
     end
 
     context "when user owns multiple enterprises" do
-      let(:user) { create_enterprise_user(enterprise_limit: 2) }
+      let(:user) { create(:user) }
 
       let!(:enterprise1) { create(:distributor_enterprise, owner: user) }
       before { create(:distributor_enterprise, owner: user) }
diff --git a/spec/controllers/spree/admin/search_controller_spec.rb b/spec/controllers/spree/admin/search_controller_spec.rb
index 48fffbabcd..d1219e8e67 100644
--- a/spec/controllers/spree/admin/search_controller_spec.rb
+++ b/spec/controllers/spree/admin/search_controller_spec.rb
@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe Spree::Admin::SearchController, type: :controller do
-  include AuthenticationWorkflow
   context "Distributor Enterprise User" do
-    let!(:owner) { create_enterprise_user( email: "test1@email.com" ) }
-    let!(:manager) { create_enterprise_user( email: "test2@email.com" ) }
-    let!(:random) { create_enterprise_user( email: "test3@email.com" ) }
+    let!(:owner) { create(:user, email: "test1@email.com" ) }
+    let!(:manager) { create(:user, email: "test2@email.com" ) }
+    let!(:random) { create(:user, email: "test3@email.com" ) }
     let!(:enterprise) { create(:enterprise, owner: owner, users: [owner, manager]) }
     before { login_as_enterprise_user [enterprise] }
 
diff --git a/spec/controllers/spree/credit_cards_controller_spec.rb b/spec/controllers/spree/credit_cards_controller_spec.rb
index 2c4f6a3a15..e98956ae32 100644
--- a/spec/controllers/spree/credit_cards_controller_spec.rb
+++ b/spec/controllers/spree/credit_cards_controller_spec.rb
@@ -2,8 +2,7 @@ require 'spec_helper'
 require 'support/request/authentication_workflow'
 
 describe Spree::CreditCardsController, type: :controller do
-  include AuthenticationWorkflow
-  let(:user) { create_enterprise_user }
+  let(:user) { create(:user) }
   let(:token) { "tok_234bd2c22" }
 
   before do
diff --git a/spec/controllers/spree/user_sessions_controller_spec.rb b/spec/controllers/spree/user_sessions_controller_spec.rb
index 60cbbb7d03..d5bcff290c 100644
--- a/spec/controllers/spree/user_sessions_controller_spec.rb
+++ b/spec/controllers/spree/user_sessions_controller_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Spree::UserSessionsController, type: :controller do
-  include AuthenticationWorkflow
-
-  let(:user) { create_enterprise_user }
+  let(:user) { create(:user) }
 
   before do
     @request.env["devise.mapping"] = Devise.mappings[:spree_user]
diff --git a/spec/controllers/user_confirmations_controller_spec.rb b/spec/controllers/user_confirmations_controller_spec.rb
index 9920330161..2fed4d0418 100644
--- a/spec/controllers/user_confirmations_controller_spec.rb
+++ b/spec/controllers/user_confirmations_controller_spec.rb
@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe UserConfirmationsController, type: :controller do
-  include AuthenticationWorkflow
   include OpenFoodNetwork::EmailHelper
 
-  let!(:user) { create_enterprise_user }
-  let!(:confirmed_user) { create_enterprise_user(confirmed_at: nil) }
-  let!(:unconfirmed_user) { create_enterprise_user(confirmed_at: nil) }
+  let!(:user) { create(:user) }
+  let!(:confirmed_user) { create(:user, confirmed_at: nil) }
+  let!(:unconfirmed_user) { create(:user, confirmed_at: nil) }
   let!(:confirmed_token) { confirmed_user.confirmation_token }
 
   before do
diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index a92afed022..cbd50ed2d9 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -719,7 +719,7 @@ feature '
     let!(:line_item_not_distributed) { create(:line_item_with_shipment, order: o2, product: create(:product, supplier: s1) ) }
 
     before(:each) do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       @enterprise_user.enterprise_roles.build(enterprise: s1).save
       @enterprise_user.enterprise_roles.build(enterprise: d1).save
 
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index c0b55ed224..c216cda878 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -658,7 +658,7 @@ feature '
     end
 
     before do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       @enterprise_user.enterprise_roles.build(enterprise: supplier_managed1).save
       @enterprise_user.enterprise_roles.build(enterprise: supplier_managed2).save
       @enterprise_user.enterprise_roles.build(enterprise: distributor_managed).save
diff --git a/spec/features/admin/customers_spec.rb b/spec/features/admin/customers_spec.rb
index a78e5b70e4..2260e2261a 100644
--- a/spec/features/admin/customers_spec.rb
+++ b/spec/features/admin/customers_spec.rb
@@ -6,7 +6,7 @@ feature 'Customers' do
   include WebHelper
 
   context "as an enterprise user" do
-    let(:user) { create_enterprise_user(enterprise_limit: 10) }
+    let(:user) { create(:user, enterprise_limit: 10) }
     let(:managed_distributor1) { create(:distributor_enterprise, owner: user) }
     let(:managed_distributor2) { create(:distributor_enterprise, owner: user) }
     let(:unmanaged_distributor) { create(:distributor_enterprise) }
diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
index a231f272e5..5129953df6 100644
--- a/spec/features/admin/enterprise_fees_spec.rb
+++ b/spec/features/admin/enterprise_fees_spec.rb
@@ -4,8 +4,8 @@ feature '
     As an administrator
     I want to manage enterprise fees
 ', js: true do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   let!(:tax_category_gst) { create(:tax_category, name: 'GST') }
 
@@ -107,7 +107,7 @@ feature '
   end
 
   context "as an enterprise manager" do
-    let(:enterprise_user) { create_enterprise_user }
+    let(:enterprise_user) { create(:user) }
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Second Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Third Distributor') }
diff --git a/spec/features/admin/enterprise_groups_spec.rb b/spec/features/admin/enterprise_groups_spec.rb
index c6fa57b055..029e3c3283 100644
--- a/spec/features/admin/enterprise_groups_spec.rb
+++ b/spec/features/admin/enterprise_groups_spec.rb
@@ -4,8 +4,8 @@ feature '
     As an administrator
     I want to manage enterprise groups
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   before(:each) do
     login_to_admin_section
@@ -107,7 +107,7 @@ feature '
   end
 
   context "as an enterprise user" do
-    let(:user) { create_enterprise_user }
+    let(:user) { create(:user) }
     let!(:enterprise) { create(:distributor_enterprise, owner: user) }
     let!(:group) { create(:enterprise_group, name: 'My Group', owner: user) }
 
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index 1926503045..43f4441108 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -4,8 +4,8 @@ feature '
   As an Administrator
   I want to manage relationships between enterprises
 ', js: true do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   context "as a site administrator" do
     before { quick_login_as_admin }
@@ -92,7 +92,7 @@ feature '
     let!(:d1) { create(:distributor_enterprise) }
     let!(:d2) { create(:distributor_enterprise) }
     let!(:d3) { create(:distributor_enterprise) }
-    let(:enterprise_user) { create_enterprise_user( enterprises: [d1] ) }
+    let(:enterprise_user) { create(:user, enterprises: [d1] ) }
 
     let!(:er1) { create(:enterprise_relationship, parent: d1, child: d2) }
     let!(:er2) { create(:enterprise_relationship, parent: d2, child: d1) }
diff --git a/spec/features/admin/enterprise_user_spec.rb b/spec/features/admin/enterprise_user_spec.rb
index 6b4f4dd778..d62322bc14 100644
--- a/spec/features/admin/enterprise_user_spec.rb
+++ b/spec/features/admin/enterprise_user_spec.rb
@@ -4,10 +4,10 @@ feature '
     As a Super User
     I want to setup users to manage an enterprise
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
-  let!(:user) { create_enterprise_user }
+  let!(:user) { create(:user) }
   let!(:supplier1) { create(:supplier_enterprise, name: 'Supplier 1') }
   let!(:supplier2) { create(:supplier_enterprise, name: 'Supplier 2') }
   let(:supplier_profile) { create(:supplier_enterprise, name: 'Supplier profile', sells: 'none') }
diff --git a/spec/features/admin/enterprises/images_spec.rb b/spec/features/admin/enterprises/images_spec.rb
index 110b8c2664..ba264b4ca0 100644
--- a/spec/features/admin/enterprises/images_spec.rb
+++ b/spec/features/admin/enterprises/images_spec.rb
@@ -1,11 +1,11 @@
 require "spec_helper"
 
 feature "Managing enterprise images" do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   context "as an Enterprise user", js: true do
-    let(:enterprise_user) { create_enterprise_user(enterprise_limit: 1) }
+    let(:enterprise_user) { create(:user, enterprise_limit: 1) }
     let(:distributor) { create(:distributor_enterprise, name: "First Distributor") }
 
     before do
diff --git a/spec/features/admin/enterprises/index_spec.rb b/spec/features/admin/enterprises/index_spec.rb
index b4897cbb11..78b348fcd9 100644
--- a/spec/features/admin/enterprises/index_spec.rb
+++ b/spec/features/admin/enterprises/index_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 feature 'Enterprises Index' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   context "as an admin user" do
     scenario "listing enterprises" do
@@ -36,7 +36,7 @@ feature 'Enterprises Index' do
     context "editing enterprises in bulk" do
       let!(:s){ create(:supplier_enterprise) }
       let!(:d){ create(:distributor_enterprise, sells: 'none') }
-      let!(:d_manager) { create_enterprise_user(enterprise_limit: 1) }
+      let!(:d_manager) { create(:user, enterprise_limit: 1) }
 
       before do
         d_manager.enterprise_roles.build(enterprise: d).save
@@ -107,7 +107,7 @@ feature 'Enterprises Index' do
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Another Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Yet Another Distributor') }
-    let(:enterprise_manager) { create_enterprise_user }
+    let(:enterprise_manager) { create(:user) }
     let!(:er) { create(:enterprise_relationship, parent: distributor3, child: distributor1, permissions_list: [:edit_profile]) }
 
     before(:each) do
@@ -165,7 +165,7 @@ feature 'Enterprises Index' do
   end
 
   describe "as the owner of an enterprise" do
-    let!(:user) { create_enterprise_user }
+    let!(:user) { create(:user) }
     let!(:owned_distributor) { create(:distributor_enterprise, name: 'Owned Distributor', owner: user) }
 
     before do
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index 4244e265e7..bd06ebc1a4 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -4,8 +4,8 @@ feature '
     As an administrator
     I want to manage enterprises
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   scenario "viewing an enterprise" do
     e = create(:enterprise)
@@ -287,7 +287,7 @@ feature '
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Another Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Yet Another Distributor') }
-    let(:enterprise_user) { create_enterprise_user(enterprise_limit: 1) }
+    let(:enterprise_user) { create(:user, enterprise_limit: 1) }
     let!(:er) { create(:enterprise_relationship, parent: distributor3, child: distributor1, permissions_list: [:edit_profile]) }
 
     before(:each) do
diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/features/admin/order_cycles/simple_spec.rb
index 0d6872c19c..b946eefae8 100644
--- a/spec/features/admin/order_cycles/simple_spec.rb
+++ b/spec/features/admin/order_cycles/simple_spec.rb
@@ -151,7 +151,7 @@ feature '
 
     context "that is a manager of the coordinator" do
       before do
-        @new_user = create_enterprise_user
+        @new_user = create(:user)
         @new_user.enterprise_roles.build(enterprise: supplier_managed).save
         @new_user.enterprise_roles.build(enterprise: distributor_managed).save
         @new_user.enterprise_roles.build(enterprise: other_distributor_managed).save
@@ -288,7 +288,7 @@ feature '
     end
 
     context "that is a manager of a participating producer" do
-      let(:new_user) { create_enterprise_user }
+      let(:new_user) { create(:user) }
 
       before do
         new_user.enterprise_roles.build(enterprise: supplier_managed).save
@@ -354,7 +354,7 @@ feature '
 
     context "that is the manager of a participating hub" do
       let(:my_distributor) { create(:distributor_enterprise) }
-      let(:new_user) { create_enterprise_user }
+      let(:new_user) { create(:user) }
 
       before do
         create(:enterprise_relationship, parent: supplier_managed, child: my_distributor, permissions_list: [:add_to_order_cycle])
@@ -419,7 +419,7 @@ feature '
   end
 
   describe "simplified interface for enterprise users selling only their own produce" do
-    let(:user) { create_enterprise_user }
+    let(:user) { create(:user) }
     let(:enterprise) { create(:enterprise, is_primary_producer: true, sells: 'own') }
     let!(:p1) { create(:simple_product, supplier: enterprise) }
     let!(:p2) { create(:simple_product, supplier: enterprise) }
diff --git a/spec/features/admin/order_print_ticket_spec.rb b/spec/features/admin/order_print_ticket_spec.rb
index add2ef9e7d..1718e62436 100644
--- a/spec/features/admin/order_print_ticket_spec.rb
+++ b/spec/features/admin/order_print_ticket_spec.rb
@@ -6,8 +6,8 @@ feature '
     As an administrator
     I want to print a ticket for an order
 ', js: true do
-  include AuthenticationWorkflow
   include CheckoutHelper
+  include AuthenticationWorkflow
   include ActionView::Helpers::NumberHelper
 
   context "as an enterprise manager" do
@@ -24,7 +24,7 @@ feature '
     end
 
     before do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       @enterprise_user.enterprise_roles.build(enterprise: distributor).save
 
       quick_login_as @enterprise_user
diff --git a/spec/features/admin/order_spec.rb b/spec/features/admin/order_spec.rb
index 009092686b..7fec04d8ee 100644
--- a/spec/features/admin/order_spec.rb
+++ b/spec/features/admin/order_spec.rb
@@ -6,8 +6,8 @@ feature '
     As an administrator
     I want to create and edit orders
 ', js: true do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   let(:user) { create(:user) }
   let(:product) { create(:simple_product) }
@@ -187,7 +187,7 @@ feature '
     let(:product) { order_cycle1.products.first }
 
     before(:each) do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       @enterprise_user.enterprise_roles.build(enterprise: supplier1).save
       @enterprise_user.enterprise_roles.build(enterprise: coordinator1).save
       @enterprise_user.enterprise_roles.build(enterprise: distributor1).save
diff --git a/spec/features/admin/overview_spec.rb b/spec/features/admin/overview_spec.rb
index 3d472dac2f..460d4cf433 100644
--- a/spec/features/admin/overview_spec.rb
+++ b/spec/features/admin/overview_spec.rb
@@ -4,13 +4,13 @@ feature '
   As a backend user
   I want to be given information about the state of my enterprises, products and order cycles
 ', js: true do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
   include ::Spree::TestingSupport::AuthorizationHelpers
 
   context "as an enterprise user" do
     before do
-      @enterprise_user = create_enterprise_user
+      @enterprise_user = create(:user)
       allow_any_instance_of(Spree::Admin::OverviewController).to receive(:spree_current_user).and_return @enterprise_user
       quick_login_as @enterprise_user
     end
diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb
index 356c450611..6ca99e8c85 100644
--- a/spec/features/admin/payment_method_spec.rb
+++ b/spec/features/admin/payment_method_spec.rb
@@ -4,8 +4,8 @@ feature '
     As a Super Admin
     I want to be able to set a distributor on each payment method
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   background do
     @distributors = (1..3).map { create(:distributor_enterprise) }
@@ -131,7 +131,7 @@ feature '
   end
 
   context "as an enterprise user", js: true do
-    let(:enterprise_user) { create_enterprise_user }
+    let(:enterprise_user) { create(:user) }
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Second Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Third Distributor') }
diff --git a/spec/features/admin/product_import_spec.rb b/spec/features/admin/product_import_spec.rb
index e12f2db82c..fac9e73628 100644
--- a/spec/features/admin/product_import_spec.rb
+++ b/spec/features/admin/product_import_spec.rb
@@ -7,8 +7,8 @@ feature "Product Import", js: true do
   include WebHelper
 
   let!(:admin) { create(:admin_user) }
-  let!(:user) { create_enterprise_user }
-  let!(:user2) { create_enterprise_user }
+  let!(:user) { create(:user) }
+  let!(:user2) { create(:user) }
   let!(:enterprise) { create(:supplier_enterprise, owner: user, name: "User Enterprise") }
   let!(:enterprise2) { create(:distributor_enterprise, owner: user2, name: "Another Enterprise") }
   let!(:relationship) { create(:enterprise_relationship, parent: enterprise, child: enterprise2, permissions_list: [:create_variant_overrides]) }
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index b2ef204312..33777da783 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -4,8 +4,8 @@ feature '
     As an admin
     I want to set a supplier and distributor(s) for a product
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   let!(:taxon) { create(:taxon) }
   let!(:stock_location) { create(:stock_location, backorderable_default: false) }
@@ -97,7 +97,7 @@ feature '
     let!(:tax_category) { create(:tax_category) }
 
     before do
-      @new_user = create_enterprise_user
+      @new_user = create(:user)
       @supplier2 = create(:supplier_enterprise, name: 'Another Supplier')
       @supplier_permitted = create(:supplier_enterprise, name: 'Permitted Supplier')
       @new_user.enterprise_roles.build(enterprise: @supplier2).save
diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb
index b8eb70f010..dc4dfe58df 100644
--- a/spec/features/admin/reports_spec.rb
+++ b/spec/features/admin/reports_spec.rb
@@ -4,22 +4,22 @@ feature '
     As an administrator
     I want numbers, all the numbers!
 ' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   context "Permissions for different reports" do
     context "As an enterprise user" do
       let(:user) do
-        create_enterprise_user(enterprises: [
-                                 create(:distributor_enterprise)
-                               ])
+        create(:user, enterprises: [create(:distributor_enterprise)])
       end
+
       it "does not show super admin only report" do
         login_to_admin_as user
         click_link "Reports"
         expect(page).not_to have_content "Users & Enterprises"
       end
     end
+
     context "As an admin user" do
       it "shows the super admin only report" do
         login_to_admin_section
@@ -167,8 +167,8 @@ feature '
   describe "sales tax report" do
     let(:distributor1) { create(:distributor_enterprise, with_payment_and_shipping: true, charges_sales_tax: true) }
     let(:distributor2) { create(:distributor_enterprise, with_payment_and_shipping: true, charges_sales_tax: true) }
-    let(:user1) { create_enterprise_user enterprises: [distributor1] }
-    let(:user2) { create_enterprise_user enterprises: [distributor2] }
+    let(:user1) { create(:user, enterprises: [distributor1]) }
+    let(:user2) { create(:user, enterprises: [distributor2]) }
     let!(:shipping_method) { create(:shipping_method_with, :expensive_name, distributors: [distributor1]) }
     let(:enterprise_fee) { create(:enterprise_fee, enterprise: user1.enterprises.first, tax_category: product2.tax_category, calculator: Calculator::FlatRate.new(preferred_amount: 120.0)) }
     let(:order_cycle) { create(:simple_order_cycle, coordinator: distributor1, coordinator_fees: [enterprise_fee], distributors: [distributor1], variants: [product1.master]) }
@@ -329,9 +329,9 @@ feature '
   end
 
   describe "users and enterprises report" do
-    let!(:enterprise1) { create( :enterprise, owner: create_enterprise_user ) }
-    let!(:enterprise2) { create( :enterprise, owner: create_enterprise_user ) }
-    let!(:enterprise3) { create( :enterprise, owner: create_enterprise_user ) }
+    let!(:enterprise1) { create( :enterprise, owner: create(:user) ) }
+    let!(:enterprise2) { create( :enterprise, owner: create(:user) ) }
+    let!(:enterprise3) { create( :enterprise, owner: create(:user) ) }
 
     before do
       enterprise3.enterprise_roles.build( user: enterprise1.owner ).save
@@ -379,8 +379,8 @@ feature '
   describe "Xero invoices report" do
     let(:distributor1) { create(:distributor_enterprise, with_payment_and_shipping: true, charges_sales_tax: true) }
     let(:distributor2) { create(:distributor_enterprise, with_payment_and_shipping: true, charges_sales_tax: true) }
-    let(:user1) { create_enterprise_user enterprises: [distributor1] }
-    let(:user2) { create_enterprise_user enterprises: [distributor2] }
+    let(:user1) { create(:user, enterprises: [distributor1]) }
+    let(:user2) { create(:user, enterprises: [distributor2]) }
     let(:shipping_method) { create(:shipping_method_with, :expensive_name) }
     let(:shipment) { create(:shipment_with, :shipping_method, shipping_method: shipping_method) }
 
diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb
index 84de423581..04083ff4a3 100644
--- a/spec/features/admin/shipping_methods_spec.rb
+++ b/spec/features/admin/shipping_methods_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 feature 'shipping methods' do
-  include AuthenticationWorkflow
   include WebHelper
+  include AuthenticationWorkflow
 
   before :each do
     @shipping_method = create(:shipping_method)
@@ -82,7 +82,7 @@ feature 'shipping methods' do
   end
 
   context "as an enterprise user", js: true do
-    let(:enterprise_user) { create_enterprise_user }
+    let(:enterprise_user) { create(:user) }
     let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
     let(:distributor2) { create(:distributor_enterprise, name: 'Second Distributor') }
     let(:distributor3) { create(:distributor_enterprise, name: 'Third Distributor') }
diff --git a/spec/features/admin/subscriptions_spec.rb b/spec/features/admin/subscriptions_spec.rb
index 61d5f59bcd..358ffb4671 100644
--- a/spec/features/admin/subscriptions_spec.rb
+++ b/spec/features/admin/subscriptions_spec.rb
@@ -6,7 +6,7 @@ feature 'Subscriptions' do
   include WebHelper
 
   context "as an enterprise user", js: true do
-    let!(:user) { create_enterprise_user(enterprise_limit: 10) }
+    let!(:user) { create(:user) }
     let!(:shop) { create(:distributor_enterprise, owner: user, enable_subscriptions: true) }
     let!(:shop2) { create(:distributor_enterprise, owner: user, enable_subscriptions: true) }
     let!(:shop_unmanaged) { create(:distributor_enterprise, enable_subscriptions: true) }
diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb
index 1fb6e15981..e631b546b1 100644
--- a/spec/features/admin/variant_overrides_spec.rb
+++ b/spec/features/admin/variant_overrides_spec.rb
@@ -24,7 +24,7 @@ feature "
       create(:enterprise_relationship, parent: producer_related, child: hub,
                                        permissions_list: [:create_variant_overrides])
     }
-    let(:user) { create_enterprise_user enterprises: [hub, producer_managed] }
+    let(:user) { create(:user, enterprises: [hub, producer_managed]) }
 
     before { quick_login_as user }
 
diff --git a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
index a850e1ead9..94742455e3 100644
--- a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
@@ -4,9 +4,7 @@ require 'open_food_network/order_cycle_form_applicator'
 
 module OpenFoodNetwork
   describe OrderCycleFormApplicator do
-    include AuthenticationWorkflow
-
-    let!(:user) { create_enterprise_user }
+    let!(:user) { create(:user) }
 
     context "unit specs" do
       it "creates new exchanges for incoming_exchanges" do
diff --git a/spec/lib/open_food_network/order_cycle_management_report_spec.rb b/spec/lib/open_food_network/order_cycle_management_report_spec.rb
index 8f65a80889..e0214b732a 100644
--- a/spec/lib/open_food_network/order_cycle_management_report_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_management_report_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 require 'open_food_network/order_cycle_management_report'
 
-include AuthenticationWorkflow
-
 module OpenFoodNetwork
   describe OrderCycleManagementReport do
     context "as a site admin" do
@@ -37,7 +35,7 @@ module OpenFoodNetwork
     end
 
     context "as an enterprise user" do
-      let!(:user) { create_enterprise_user }
+      let!(:user) { create(:user) }
 
       subject { OrderCycleManagementReport.new user, {}, true }
 
diff --git a/spec/lib/open_food_network/users_and_enterprises_report_spec.rb b/spec/lib/open_food_network/users_and_enterprises_report_spec.rb
index 0587e7bbaa..f7503d992c 100644
--- a/spec/lib/open_food_network/users_and_enterprises_report_spec.rb
+++ b/spec/lib/open_food_network/users_and_enterprises_report_spec.rb
@@ -3,8 +3,6 @@ require 'open_food_network/users_and_enterprises_report'
 
 module OpenFoodNetwork
   describe UsersAndEnterprisesReport do
-    include AuthenticationWorkflow
-
     describe "users_and_enterprises" do
       let!(:owners_and_enterprises) { double(:owners_and_enterprises) }
       let!(:managers_and_enterprises) { double(:managers_and_enterprises) }
@@ -63,8 +61,8 @@ module OpenFoodNetwork
     end
 
     describe "filtering results" do
-      let!(:enterprise1) { create(:enterprise, owner: create_enterprise_user ) }
-      let!(:enterprise2) { create(:enterprise, owner: create_enterprise_user ) }
+      let!(:enterprise1) { create(:enterprise, owner: create(:user) ) }
+      let!(:enterprise2) { create(:enterprise, owner: create(:user) ) }
 
       describe "for owners and enterprises" do
         describe "by enterprise id" do
@@ -103,8 +101,8 @@ module OpenFoodNetwork
         end
 
         describe "by user id" do
-          let!(:manager1) { create_enterprise_user }
-          let!(:manager2) { create_enterprise_user }
+          let!(:manager1) { create(:user) }
+          let!(:manager2) { create(:user) }
           let!(:params) { { user_id_in: [manager1.id.to_s] } }
           let!(:subject) { OpenFoodNetwork::UsersAndEnterprisesReport.new params, true }
 
diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb
index 9d5c7a0879..b5dad386a5 100644
--- a/spec/models/enterprise_spec.rb
+++ b/spec/models/enterprise_spec.rb
@@ -1,11 +1,9 @@
 require 'spec_helper'
 
 describe Enterprise do
-  include AuthenticationWorkflow
-
   describe "sending emails" do
     describe "on creation" do
-      let!(:user) { create_enterprise_user( enterprise_limit: 2 ) }
+      let!(:user) { create(:user) }
       let!(:enterprise) { create(:enterprise, owner: user) }
 
       it "sends a welcome email" do
@@ -82,8 +80,8 @@ describe Enterprise do
     end
 
     describe "ownership" do
-      let(:u1) { create_enterprise_user }
-      let(:u2) { create_enterprise_user }
+      let(:u1) { create(:user) }
+      let(:u2) { create(:user) }
       let!(:e) { create(:enterprise, owner: u1 ) }
 
       it "adds new owner to list of managers" do
diff --git a/spec/models/product_importer_spec.rb b/spec/models/product_importer_spec.rb
index 89008c54f9..9c556045c7 100644
--- a/spec/models/product_importer_spec.rb
+++ b/spec/models/product_importer_spec.rb
@@ -2,12 +2,10 @@ require 'spec_helper'
 require 'open_food_network/permissions'
 
 describe ProductImport::ProductImporter do
-  include AuthenticationWorkflow
-
   let!(:admin) { create(:admin_user) }
-  let!(:user) { create_enterprise_user }
-  let!(:user2) { create_enterprise_user }
-  let!(:user3) { create_enterprise_user }
+  let!(:user) { create(:user) }
+  let!(:user2) { create(:user) }
+  let!(:user3) { create(:user) }
   let!(:enterprise) { create(:enterprise, is_primary_producer: true, owner: user, name: "User Enterprise") }
   let!(:enterprise2) { create(:distributor_enterprise, is_primary_producer: true, owner: user2, name: "Another Enterprise") }
   let!(:enterprise3) { create(:distributor_enterprise, is_primary_producer: true, owner: user3, name: "And Another Enterprise") }
diff --git a/spec/serializers/api/admin/index_enterprise_serializer_spec.rb b/spec/serializers/api/admin/index_enterprise_serializer_spec.rb
index f1d084b946..f0e0233ea2 100644
--- a/spec/serializers/api/admin/index_enterprise_serializer_spec.rb
+++ b/spec/serializers/api/admin/index_enterprise_serializer_spec.rb
@@ -1,11 +1,9 @@
 require 'spec_helper'
 
 describe Api::Admin::IndexEnterpriseSerializer do
-  include AuthenticationWorkflow
-
   let(:enterprise) { create(:distributor_enterprise) }
   context "when spree_current_user is a manager" do
-    let(:user) { create_enterprise_user }
+    let(:user) { create(:user) }
     before do
       user.enterprise_roles.create(enterprise: enterprise)
     end
diff --git a/spec/views/spree/admin/orders/edit.html.haml_spec.rb b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
index b33cd187ef..e6b779df39 100644
--- a/spec/views/spree/admin/orders/edit.html.haml_spec.rb
+++ b/spec/views/spree/admin/orders/edit.html.haml_spec.rb
@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe "spree/admin/orders/edit.html.haml" do
-  include AuthenticationWorkflow
   helper Spree::BaseHelper # required to make pretty_time work
 
   around do |example|
@@ -17,7 +16,7 @@ describe "spree/admin/orders/edit.html.haml" do
       end
     end
 
-    allow(view).to receive_messages spree_current_user: create_enterprise_user
+    allow(view).to receive_messages spree_current_user: create(:user)
 
     order = create(:completed_order_with_fees)
     order.distributor = create(:distributor_enterprise)
diff --git a/spec/views/spree/admin/orders/index.html.haml_spec.rb b/spec/views/spree/admin/orders/index.html.haml_spec.rb
index 8cbbfeb90a..8379a77610 100644
--- a/spec/views/spree/admin/orders/index.html.haml_spec.rb
+++ b/spec/views/spree/admin/orders/index.html.haml_spec.rb
@@ -1,8 +1,6 @@
 require "spec_helper"
 
 describe "spree/admin/orders/index.html.haml" do
-  include AuthenticationWorkflow
-
   around do |example|
     original_config = Spree::Config[:enable_invoices?]
     example.run
@@ -16,7 +14,7 @@ describe "spree/admin/orders/index.html.haml" do
       end
     end
 
-    allow(view).to receive_messages spree_current_user: create_enterprise_user
+    allow(view).to receive_messages spree_current_user: create(:user)
   end
 
   describe "print invoices button" do