diff --git a/cms/models_test.py b/cms/models_test.py
index dd0ec2ff36..87745bde5f 100644
--- a/cms/models_test.py
+++ b/cms/models_test.py
@@ -288,7 +288,7 @@ def test_flex_pricing_form_display(mocker, is_authed, has_submission):
                 courseware_object=flex_form.selected_course,
             )
 
-    response = generate_flexible_pricing_response(request_user, flex_form)
+    response = generate_flexible_pricing_response(mocker, request_user, flex_form)
 
     # simple string checking for the rendered content
     # should match what's in the factory
@@ -330,7 +330,7 @@ def test_flex_pricing_form_state_display(mocker, submission_status):
         courseware_object=course_page.course,
     )
 
-    response = generate_flexible_pricing_response(request_user, flex_form)
+    response = generate_flexible_pricing_response(mocker, request_user, flex_form)
 
     if submission_status == FlexiblePriceStatus.CREATED:
         assert "Application Processing" in response.rendered_content
@@ -481,13 +481,13 @@ def test_flex_pricing_single_submission(
 
     # test to make sure we get back a status message from the first form
 
-    response = generate_flexible_pricing_response(request_user, first_sub_form)
+    response = generate_flexible_pricing_response(mocker, request_user, first_sub_form)
 
     assert "Application Processing" in response.rendered_content
 
     # then test to make sure we get a status message back from the second form too
 
-    response = generate_flexible_pricing_response(request_user, second_sub_form)
+    response = generate_flexible_pricing_response(mocker, request_user, second_sub_form)
 
     # should not get a form here - should get Application Processing
 
@@ -534,7 +534,7 @@ def test_flex_pricing_form_state_display_no_discount_tier(
         tier=tier,
     )
 
-    response = generate_flexible_pricing_response(request_user, flex_form)
+    response = generate_flexible_pricing_response(mocker, request_user, flex_form)
 
     assert "No Discount Text" in response.rendered_content
 
@@ -542,7 +542,7 @@ def test_flex_pricing_form_state_display_no_discount_tier(
     flexprice.save()
     flexprice.refresh_from_db()
 
-    response = generate_flexible_pricing_response(request_user, flex_form)
+    response = generate_flexible_pricing_response(mocker, request_user, flex_form)
 
     assert "Approved" in response.rendered_content
 
diff --git a/ecommerce/api.py b/ecommerce/api.py
index d055b70d62..4929981ab0 100644
--- a/ecommerce/api.py
+++ b/ecommerce/api.py
@@ -434,7 +434,8 @@ def refund_order(*, order_id: int = None, reference_number: str = None, **kwargs
 
     if response.state in REFUND_SUCCESS_STATES:
         # Record refund transaction with PaymentGateway's refund response
-        order.refund(
+        order_flow = order.get_object_flow()
+        order_flow.refund(
             api_response_data=response.response_data,
             amount=transaction_dict["req_amount"],
             reason=refund_reason,
diff --git a/ecommerce/api_test.py b/ecommerce/api_test.py
index 4946843fd7..f2f4cbb590 100644
--- a/ecommerce/api_test.py
+++ b/ecommerce/api_test.py
@@ -519,10 +519,10 @@ def test_check_and_process_pending_orders_for_resolution(mocker, test_type):
     # mocking out the create_enrollment and create_paid_courserun calls
     # we don't really care that it hits edX for this
     mocker.patch(
-        "ecommerce.models.FulfillableOrder.create_enrollments", return_value=True
+        "ecommerce.models.OrderFlow.create_enrollments", return_value=True
     )
     mocker.patch(
-        "ecommerce.models.FulfillableOrder.create_paid_courseruns", return_value=True
+        "ecommerce.models.OrderFlow.create_paid_courseruns", return_value=True
     )
 
     test_payload = {