diff --git a/spec/factories.rb b/spec/factories.rb
index d605b5b759..db035ba16a 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -10,21 +10,29 @@ FactoryGirl.define do
 
     after(:create) do |oc|
       # Suppliers
+      supplier1 = create(:supplier_enterprise)
+      supplier2 = create(:supplier_enterprise)
+
+      # Incoming Exchanges
       ex1 = create(:exchange, :order_cycle => oc, :incoming => true,
-                   :sender => create(:supplier_enterprise), :receiver => oc.coordinator)
+                   :sender => supplier1, :receiver => oc.coordinator)
       ex2 = create(:exchange, :order_cycle => oc, :incoming => true,
-                   :sender => create(:supplier_enterprise), :receiver => oc.coordinator)
+                   :sender => supplier2, :receiver => oc.coordinator)
       ExchangeFee.create!(exchange: ex1,
                           enterprise_fee: create(:enterprise_fee, enterprise: ex1.sender))
       ExchangeFee.create!(exchange: ex2,
                           enterprise_fee: create(:enterprise_fee, enterprise: ex2.sender))
 
-      # Distributors
+      #Distributors
+      distributor1 = create(:distributor_enterprise)
+      distributor2 = create(:distributor_enterprise)
+
+      # Outgoing Exchanges
       ex3 = create(:exchange, :order_cycle => oc, :incoming => false,
-                   :sender => oc.coordinator, :receiver => create(:distributor_enterprise),
+                   :sender => oc.coordinator, :receiver => distributor1,
                    :pickup_time => 'time 0', :pickup_instructions => 'instructions 0')
       ex4 = create(:exchange, :order_cycle => oc, :incoming => false,
-                   :sender => oc.coordinator, :receiver => create(:distributor_enterprise),
+                   :sender => oc.coordinator, :receiver => distributor2,
                    :pickup_time => 'time 1', :pickup_instructions => 'instructions 1')
       ExchangeFee.create!(exchange: ex3,
                           enterprise_fee: create(:enterprise_fee, enterprise: ex3.receiver))