diff --git a/engines/order_management/spec/services/order_management/stock/estimator_spec.rb b/engines/order_management/spec/services/order_management/stock/estimator_spec.rb
index 6d14903cbd..e71d452798 100644
--- a/engines/order_management/spec/services/order_management/stock/estimator_spec.rb
+++ b/engines/order_management/spec/services/order_management/stock/estimator_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 module OrderManagement
   module Stock
     describe Estimator do
-      let!(:shipping_method) { create(:shipping_method, zones: [Spree::Zone.global] ) }
+      let!(:shipping_method) { create(:shipping_method, zones: [create(:zone)] ) }
       let(:package) { build(:stock_package_fulfilled) }
       let(:order) { package.order }
       subject { Estimator.new(order) }
diff --git a/spec/factories/stock_factory.rb b/spec/factories/stock_factory.rb
new file mode 100644
index 0000000000..9cb4b2a2eb
--- /dev/null
+++ b/spec/factories/stock_factory.rb
@@ -0,0 +1,20 @@
+FactoryBot.define do
+  factory :stock_package, class: Spree::Stock::Package do
+    ignore do
+      stock_location { build(:stock_location) }
+      order { create(:order_with_line_items, line_items_count: 2) }
+      contents []
+    end
+
+    initialize_with { new(stock_location, order, contents) }
+
+    factory :stock_package_fulfilled do
+      after(:build) do |package, evaluator|
+        evaluator.order.line_items.reload
+        evaluator.order.line_items.each do |line_item|
+          package.add line_item.variant, line_item.quantity, :on_hand
+        end
+      end
+    end
+  end
+end