diff --git a/app/serializers/api/admin/customer_with_balance_serializer.rb b/app/serializers/api/admin/customer_with_balance_serializer.rb
index 69f740ac9d..90f2726a10 100644
--- a/app/serializers/api/admin/customer_with_balance_serializer.rb
+++ b/app/serializers/api/admin/customer_with_balance_serializer.rb
@@ -3,8 +3,8 @@
 module Api
   module Admin
     # This serializer relies on `object` to respond to `#balance_value`. That's done in
-    # `CustomersWithBalanceQuery` due to the fact that ActiveRecord maps the DB result set's columns to
-    # instance methods. This way, the `balance_value` alias on that class ends up being
+    # `CustomersWithBalanceQuery` due to the fact that ActiveRecord maps the DB result set's
+    # columns to instance methods. This way, the `balance_value` alias on that class ends up being
     # `object.balance_value` here.
     class CustomerWithBalanceSerializer < CustomerSerializer
       attributes :balance, :balance_status
diff --git a/app/serializers/api/order_serializer.rb b/app/serializers/api/order_serializer.rb
index 900d2aeaa0..b8fa04dff2 100644
--- a/app/serializers/api/order_serializer.rb
+++ b/app/serializers/api/order_serializer.rb
@@ -9,8 +9,8 @@ module Api
 
     has_many :payments, serializer: Api::PaymentSerializer
 
-    # This method relies on `balance_value` as a computed DB column. See `CompleteOrdersWithBalanceQuery`
-    # for reference.
+    # This method relies on `balance_value` as a computed DB column.
+    # See `CompleteOrdersWithBalanceQuery` for reference.
     def outstanding_balance
       -object.balance_value
     end
diff --git a/spec/lib/reports/order_cycle_management_report_spec.rb b/spec/lib/reports/order_cycle_management_report_spec.rb
index 72d6c44831..80bed21b3c 100644
--- a/spec/lib/reports/order_cycle_management_report_spec.rb
+++ b/spec/lib/reports/order_cycle_management_report_spec.rb
@@ -18,7 +18,8 @@ module Reporting
 
           describe "fetching orders" do
             it 'calls the OutstandingBalanceQuery query object' do
-              outstanding_balance = instance_double(OutstandingBalanceQuery, call: Spree::Order.none)
+              outstanding_balance = instance_double(OutstandingBalanceQuery,
+                                                    call: Spree::Order.none)
               expect(OutstandingBalanceQuery).to receive(:new).and_return(outstanding_balance)
 
               subject.orders
diff --git a/spec/queries/complete_orders_with_balance_query_spec.rb b/spec/queries/complete_orders_with_balance_query_spec.rb
index 979efb1f08..0f7e856865 100644
--- a/spec/queries/complete_orders_with_balance_query_spec.rb
+++ b/spec/queries/complete_orders_with_balance_query_spec.rb
@@ -26,9 +26,11 @@ describe CompleteOrdersWithBalanceQuery do
 
       it 'calls OutstandingBalanceQuery#call' do
         allow(OutstandingBalanceQuery).to receive(:new).and_return(outstanding_balance)
-        expect(outstanding_balance).to receive(:call)
+        allow(outstanding_balance).to receive(:call)
 
         result
+
+        expect(outstanding_balance).to have_received(:call)
       end
 
       it 'returns complete orders including their balance' do
@@ -46,9 +48,11 @@ describe CompleteOrdersWithBalanceQuery do
 
       it 'calls OutstandingBalanceQuery' do
         allow(OutstandingBalanceQuery).to receive(:new).and_return(outstanding_balance)
-        expect(outstanding_balance).to receive(:call)
+        allow(outstanding_balance).to receive(:call)
 
         result
+
+        expect(outstanding_balance).to have_received(:call)
       end
 
       it 'returns an empty array' do
diff --git a/spec/queries/outstanding_balance_query_spec.rb b/spec/queries/outstanding_balance_query_spec.rb
index feba121359..77e9acb307 100644
--- a/spec/queries/outstanding_balance_query_spec.rb
+++ b/spec/queries/outstanding_balance_query_spec.rb
@@ -9,10 +9,9 @@ describe OutstandingBalanceQuery do
 
   describe '#statement' do
     let(:relation) { Spree::Order.none }
+    let(:normalized_sql_statement) { normalize(query.statement) }
 
     it 'returns the CASE statement necessary to compute the order balance' do
-      normalized_sql_statement = normalize(query.statement)
-
       expect(normalized_sql_statement).to eq(normalize(<<-SQL.squish))
         CASE WHEN "spree_orders"."state" IN ('canceled', 'returned') THEN "spree_orders"."payment_total"
              WHEN "spree_orders"."state" IS NOT NULL THEN "spree_orders"."payment_total" - "spree_orders"."total"