From 57e98d3cb7f57228524922dfe4f195fc963dc8d6 Mon Sep 17 00:00:00 2001
From: Robert Sullivan <robert.sullivan@softwire.com>
Date: Wed, 27 Mar 2024 15:11:04 +0000
Subject: [PATCH] Further test updates for deposit derivation change

---
 .../questions/address_line1_for_address_matcher_spec.rb         | 2 +-
 spec/models/form/lettings/questions/address_line1_spec.rb       | 2 +-
 spec/models/form/lettings/questions/address_line2_spec.rb       | 2 +-
 spec/models/form/lettings/questions/age1_known_spec.rb          | 2 +-
 spec/models/form/lettings/questions/age_known_spec.rb           | 2 +-
 spec/models/form/lettings/questions/age_spec.rb                 | 2 +-
 spec/models/form/lettings/questions/beds_spec.rb                | 2 +-
 .../lettings/questions/care_home_charges_value_check_spec.rb    | 2 +-
 spec/models/form/lettings/questions/county_spec.rb              | 2 +-
 spec/models/form/lettings/questions/created_by_id_spec.rb       | 2 +-
 spec/models/form/lettings/questions/declaration_spec.rb         | 2 +-
 spec/models/form/lettings/questions/details_known_spec.rb       | 2 +-
 spec/models/form/lettings/questions/ethnic_white_spec.rb        | 2 +-
 spec/models/form/lettings/questions/gender_identity1_spec.rb    | 2 +-
 spec/models/form/lettings/questions/hb_spec.rb                  | 2 +-
 spec/models/form/lettings/questions/homeless_spec.rb            | 2 +-
 spec/models/form/lettings/questions/housingneeds_other_spec.rb  | 2 +-
 spec/models/form/lettings/questions/irproduct_other_spec.rb     | 2 +-
 spec/models/form/lettings/questions/is_carehome_spec.rb         | 2 +-
 spec/models/form/lettings/questions/joint_spec.rb               | 2 +-
 spec/models/form/lettings/questions/layear_spec.rb              | 2 +-
 spec/models/form/lettings/questions/letting_allocation_spec.rb  | 2 +-
 .../form/lettings/questions/managing_organisation_spec.rb       | 2 +-
 .../lettings/questions/multiple_partners_value_check_spec.rb    | 2 +-
 spec/models/form/lettings/questions/nationality_spec.rb         | 2 +-
 spec/models/form/lettings/questions/no_address_found_spec.rb    | 2 +-
 spec/models/form/lettings/questions/offered_spec.rb             | 2 +-
 .../form/lettings/questions/partner_under16_value_check_spec.rb | 2 +-
 .../form/lettings/questions/person_gender_identity_spec.rb      | 2 +-
 spec/models/form/lettings/questions/person_relationship_spec.rb | 2 +-
 .../form/lettings/questions/person_working_situation_spec.rb    | 2 +-
 .../lettings/questions/postcode_for_address_matcher_spec.rb     | 2 +-
 .../form/lettings/questions/postcode_for_full_address_spec.rb   | 2 +-
 spec/models/form/lettings/questions/ppcodenk_spec.rb            | 2 +-
 spec/models/form/lettings/questions/previous_la_known_spec.rb   | 2 +-
 spec/models/form/lettings/questions/previous_let_type_spec.rb   | 2 +-
 .../form/lettings/questions/previous_tenure_renewal_spec.rb     | 2 +-
 spec/models/form/lettings/questions/previous_tenure_spec.rb     | 2 +-
 spec/models/form/lettings/questions/property_reference_spec.rb  | 2 +-
 spec/models/form/lettings/questions/reasonpref_spec.rb          | 2 +-
 spec/models/form/lettings/questions/renewal_spec.rb             | 2 +-
 spec/models/form/lettings/questions/rent_type_spec.rb           | 2 +-
 spec/models/form/lettings/questions/rsnvac_spec.rb              | 2 +-
 spec/models/form/lettings/questions/scheme_id_spec.rb           | 2 +-
 spec/models/form/lettings/questions/sheltered_spec.rb           | 2 +-
 spec/models/form/lettings/questions/stock_owner_spec.rb         | 2 +-
 spec/models/form/lettings/questions/tenancy_length_spec.rb      | 2 +-
 spec/models/form/lettings/questions/tenancy_other_spec.rb       | 2 +-
 spec/models/form/lettings/questions/tenancy_start_date_spec.rb  | 2 +-
 spec/models/form/lettings/questions/tenancy_type_spec.rb        | 2 +-
 spec/models/form/lettings/questions/tenant_code_spec.rb         | 2 +-
 spec/models/form/lettings/questions/town_or_city_spec.rb        | 2 +-
 spec/models/form/lettings/questions/uprn_confirmation_spec.rb   | 2 +-
 spec/models/form/lettings/questions/uprn_known_spec.rb          | 2 +-
 spec/models/form/lettings/questions/uprn_selection_spec.rb      | 2 +-
 spec/models/form/lettings/questions/uprn_spec.rb                | 2 +-
 spec/models/form/lettings/questions/waityear_spec.rb            | 2 +-
 spec/models/form/lettings/questions/wheelchair_spec.rb          | 2 +-
 .../sales/questions/address_line1_for_address_matcher_spec.rb   | 2 +-
 spec/models/form/sales/questions/armed_forces_spouse_spec.rb    | 2 +-
 spec/models/form/sales/questions/buyer1_income_spec.rb          | 2 +-
 .../form/sales/questions/buyer2_ethnic_background_white_spec.rb | 2 +-
 spec/models/form/sales/questions/buyer2_living_in_spec.rb       | 2 +-
 spec/models/form/sales/questions/fromprop_spec.rb               | 2 +-
 .../form/sales/questions/household_wheelchair_check_spec.rb     | 2 +-
 spec/models/form/sales/questions/household_wheelchair_spec.rb   | 2 +-
 .../form/sales/questions/monthly_charges_value_check_spec.rb    | 2 +-
 spec/models/form/sales/questions/mortgage_lender_other_spec.rb  | 2 +-
 .../form/sales/questions/multiple_partners_value_check_spec.rb  | 2 +-
 spec/models/form/sales/questions/no_address_found_spec.rb       | 2 +-
 .../models/form/sales/questions/outright_ownership_type_spec.rb | 2 +-
 .../form/sales/questions/partner_under16_value_check_spec.rb    | 2 +-
 .../form/sales/questions/person_relationship_to_buyer1_spec.rb  | 2 +-
 .../form/sales/questions/person_working_situation_spec.rb       | 2 +-
 .../form/sales/questions/postcode_for_address_matcher_spec.rb   | 2 +-
 spec/models/form/sales/questions/previous_tenure_spec.rb        | 2 +-
 spec/models/form/sales/questions/prevshared_spec.rb             | 2 +-
 spec/models/form/sales/questions/privacy_notice_spec.rb         | 2 +-
 spec/models/form/sales/questions/property_building_type_spec.rb | 2 +-
 spec/models/form/sales/questions/property_unit_type_spec.rb     | 2 +-
 spec/models/form/sales/questions/sale_date_check_spec.rb        | 2 +-
 spec/models/form/sales/questions/savings_spec.rb                | 2 +-
 spec/models/form/sales/questions/shared_ownership_type_spec.rb  | 2 +-
 spec/models/form/sales/questions/staircase_spec.rb              | 2 +-
 spec/models/form/sales/questions/uprn_selection_spec.rb         | 2 +-
 spec/models/form/sales/questions/value_spec.rb                  | 2 +-
 86 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/spec/models/form/lettings/questions/address_line1_for_address_matcher_spec.rb b/spec/models/form/lettings/questions/address_line1_for_address_matcher_spec.rb
index 7c0baa66e..a34856035 100644
--- a/spec/models/form/lettings/questions/address_line1_for_address_matcher_spec.rb
+++ b/spec/models/form/lettings/questions/address_line1_for_address_matcher_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe Form::Lettings::Questions::AddressLine1ForAddressMatcher, type: :
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/address_line1_spec.rb b/spec/models/form/lettings/questions/address_line1_spec.rb
index 82e6a5274..7416ef97a 100644
--- a/spec/models/form/lettings/questions/address_line1_spec.rb
+++ b/spec/models/form/lettings/questions/address_line1_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::AddressLine1, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/address_line2_spec.rb b/spec/models/form/lettings/questions/address_line2_spec.rb
index 4ac51a231..4948a77bf 100644
--- a/spec/models/form/lettings/questions/address_line2_spec.rb
+++ b/spec/models/form/lettings/questions/address_line2_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::AddressLine2, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/age1_known_spec.rb b/spec/models/form/lettings/questions/age1_known_spec.rb
index ac5af8aab..5665f27ac 100644
--- a/spec/models/form/lettings/questions/age1_known_spec.rb
+++ b/spec/models/form/lettings/questions/age1_known_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::Age1Known, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/age_known_spec.rb b/spec/models/form/lettings/questions/age_known_spec.rb
index bac940097..8e4c60fe6 100644
--- a/spec/models/form/lettings/questions/age_known_spec.rb
+++ b/spec/models/form/lettings/questions/age_known_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Questions::AgeKnown, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/age_spec.rb b/spec/models/form/lettings/questions/age_spec.rb
index 85659fc8f..3fe34e51b 100644
--- a/spec/models/form/lettings/questions/age_spec.rb
+++ b/spec/models/form/lettings/questions/age_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe Form::Lettings::Questions::Age, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "when child" do
diff --git a/spec/models/form/lettings/questions/beds_spec.rb b/spec/models/form/lettings/questions/beds_spec.rb
index 6291892b1..2c68cabfe 100644
--- a/spec/models/form/lettings/questions/beds_spec.rb
+++ b/spec/models/form/lettings/questions/beds_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Beds, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct min" do
diff --git a/spec/models/form/lettings/questions/care_home_charges_value_check_spec.rb b/spec/models/form/lettings/questions/care_home_charges_value_check_spec.rb
index d31891c5d..5b14949a3 100644
--- a/spec/models/form/lettings/questions/care_home_charges_value_check_spec.rb
+++ b/spec/models/form/lettings/questions/care_home_charges_value_check_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe Form::Lettings::Questions::CareHomeChargesValueCheck, type: :mode
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/county_spec.rb b/spec/models/form/lettings/questions/county_spec.rb
index 901bd2e9c..c3473e75d 100644
--- a/spec/models/form/lettings/questions/county_spec.rb
+++ b/spec/models/form/lettings/questions/county_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Lettings::Questions::County, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/created_by_id_spec.rb b/spec/models/form/lettings/questions/created_by_id_spec.rb
index 98e0e283b..c175997f6 100644
--- a/spec/models/form/lettings/questions/created_by_id_spec.rb
+++ b/spec/models/form/lettings/questions/created_by_id_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe Form::Lettings::Questions::CreatedById, type: :model do
   end
 
   it "is marked as derived" do
-    expect(question.derived?).to be true
+    expect(question.derived?(nil)).to be true
   end
 
   def expected_option_for_users(users)
diff --git a/spec/models/form/lettings/questions/declaration_spec.rb b/spec/models/form/lettings/questions/declaration_spec.rb
index fae18e5bc..7b90a964e 100644
--- a/spec/models/form/lettings/questions/declaration_spec.rb
+++ b/spec/models/form/lettings/questions/declaration_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/details_known_spec.rb b/spec/models/form/lettings/questions/details_known_spec.rb
index 799b307b0..abedc3f11 100644
--- a/spec/models/form/lettings/questions/details_known_spec.rb
+++ b/spec/models/form/lettings/questions/details_known_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Questions::DetailsKnown, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/ethnic_white_spec.rb b/spec/models/form/lettings/questions/ethnic_white_spec.rb
index b06490b86..cff675d64 100644
--- a/spec/models/form/lettings/questions/ethnic_white_spec.rb
+++ b/spec/models/form/lettings/questions/ethnic_white_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::EthnicWhite, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do
diff --git a/spec/models/form/lettings/questions/gender_identity1_spec.rb b/spec/models/form/lettings/questions/gender_identity1_spec.rb
index 337936dbc..8072149e0 100644
--- a/spec/models/form/lettings/questions/gender_identity1_spec.rb
+++ b/spec/models/form/lettings/questions/gender_identity1_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe Form::Lettings::Questions::GenderIdentity1, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/hb_spec.rb b/spec/models/form/lettings/questions/hb_spec.rb
index a73f030ad..20e775fcc 100644
--- a/spec/models/form/lettings/questions/hb_spec.rb
+++ b/spec/models/form/lettings/questions/hb_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Hb, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/homeless_spec.rb b/spec/models/form/lettings/questions/homeless_spec.rb
index f2b384360..e9dfbcaef 100644
--- a/spec/models/form/lettings/questions/homeless_spec.rb
+++ b/spec/models/form/lettings/questions/homeless_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Form::Lettings::Questions::Homeless, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/housingneeds_other_spec.rb b/spec/models/form/lettings/questions/housingneeds_other_spec.rb
index b6649aea4..9e1e628ff 100644
--- a/spec/models/form/lettings/questions/housingneeds_other_spec.rb
+++ b/spec/models/form/lettings/questions/housingneeds_other_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::HousingneedsOther, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do
diff --git a/spec/models/form/lettings/questions/irproduct_other_spec.rb b/spec/models/form/lettings/questions/irproduct_other_spec.rb
index aeea7ae20..2406e4618 100644
--- a/spec/models/form/lettings/questions/irproduct_other_spec.rb
+++ b/spec/models/form/lettings/questions/irproduct_other_spec.rb
@@ -28,6 +28,6 @@ RSpec.describe Form::Lettings::Questions::IrproductOther, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end
diff --git a/spec/models/form/lettings/questions/is_carehome_spec.rb b/spec/models/form/lettings/questions/is_carehome_spec.rb
index 8a2853aa3..77fb7804b 100644
--- a/spec/models/form/lettings/questions/is_carehome_spec.rb
+++ b/spec/models/form/lettings/questions/is_carehome_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::IsCarehome, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do
diff --git a/spec/models/form/lettings/questions/joint_spec.rb b/spec/models/form/lettings/questions/joint_spec.rb
index 338110e4d..7c5b26402 100644
--- a/spec/models/form/lettings/questions/joint_spec.rb
+++ b/spec/models/form/lettings/questions/joint_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe Form::Lettings::Questions::Joint, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with collection year on or after 2024" do
diff --git a/spec/models/form/lettings/questions/layear_spec.rb b/spec/models/form/lettings/questions/layear_spec.rb
index e42ac704d..7d3ec681c 100644
--- a/spec/models/form/lettings/questions/layear_spec.rb
+++ b/spec/models/form/lettings/questions/layear_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Layear, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do
diff --git a/spec/models/form/lettings/questions/letting_allocation_spec.rb b/spec/models/form/lettings/questions/letting_allocation_spec.rb
index 78cd5acca..ccd0f8a53 100644
--- a/spec/models/form/lettings/questions/letting_allocation_spec.rb
+++ b/spec/models/form/lettings/questions/letting_allocation_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::LettingAllocation, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do
diff --git a/spec/models/form/lettings/questions/managing_organisation_spec.rb b/spec/models/form/lettings/questions/managing_organisation_spec.rb
index f35f17b4f..86d58d4d3 100644
--- a/spec/models/form/lettings/questions/managing_organisation_spec.rb
+++ b/spec/models/form/lettings/questions/managing_organisation_spec.rb
@@ -231,7 +231,7 @@ RSpec.describe Form::Lettings::Questions::ManagingOrganisation, type: :model do
   end
 
   it "is marked as derived" do
-    expect(question.derived?).to be true
+    expect(question.derived?(nil)).to be true
   end
 
   describe "#hidden_in_check_answers?" do
diff --git a/spec/models/form/lettings/questions/multiple_partners_value_check_spec.rb b/spec/models/form/lettings/questions/multiple_partners_value_check_spec.rb
index 04cd6aee3..d946468b0 100644
--- a/spec/models/form/lettings/questions/multiple_partners_value_check_spec.rb
+++ b/spec/models/form/lettings/questions/multiple_partners_value_check_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::MultiplePartnersValueCheck, type: :mod
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/nationality_spec.rb b/spec/models/form/lettings/questions/nationality_spec.rb
index f32cf4f0d..600ef2692 100644
--- a/spec/models/form/lettings/questions/nationality_spec.rb
+++ b/spec/models/form/lettings/questions/nationality_spec.rb
@@ -43,6 +43,6 @@ RSpec.describe Form::Lettings::Questions::Nationality, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end
diff --git a/spec/models/form/lettings/questions/no_address_found_spec.rb b/spec/models/form/lettings/questions/no_address_found_spec.rb
index 259f0bec1..221ab6688 100644
--- a/spec/models/form/lettings/questions/no_address_found_spec.rb
+++ b/spec/models/form/lettings/questions/no_address_found_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe Form::Lettings::Questions::NoAddressFound, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/offered_spec.rb b/spec/models/form/lettings/questions/offered_spec.rb
index 45a589a32..bda69490e 100644
--- a/spec/models/form/lettings/questions/offered_spec.rb
+++ b/spec/models/form/lettings/questions/offered_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Lettings::Questions::Offered, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do
diff --git a/spec/models/form/lettings/questions/partner_under16_value_check_spec.rb b/spec/models/form/lettings/questions/partner_under16_value_check_spec.rb
index 87206a0df..dfff2a22c 100644
--- a/spec/models/form/lettings/questions/partner_under16_value_check_spec.rb
+++ b/spec/models/form/lettings/questions/partner_under16_value_check_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::PartnerUnder16ValueCheck, type: :model
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/person_gender_identity_spec.rb b/spec/models/form/lettings/questions/person_gender_identity_spec.rb
index 49daf60ed..60a0608e5 100644
--- a/spec/models/form/lettings/questions/person_gender_identity_spec.rb
+++ b/spec/models/form/lettings/questions/person_gender_identity_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::PersonGenderIdentity, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with form year before 2024" do
diff --git a/spec/models/form/lettings/questions/person_relationship_spec.rb b/spec/models/form/lettings/questions/person_relationship_spec.rb
index 51975e719..65e9746d9 100644
--- a/spec/models/form/lettings/questions/person_relationship_spec.rb
+++ b/spec/models/form/lettings/questions/person_relationship_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Questions::PersonRelationship, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/person_working_situation_spec.rb b/spec/models/form/lettings/questions/person_working_situation_spec.rb
index b4af7eb62..3e564823e 100644
--- a/spec/models/form/lettings/questions/person_working_situation_spec.rb
+++ b/spec/models/form/lettings/questions/person_working_situation_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Questions::PersonWorkingSituation, type: :model d
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/postcode_for_address_matcher_spec.rb b/spec/models/form/lettings/questions/postcode_for_address_matcher_spec.rb
index e213e0fc4..b0b5c37bf 100644
--- a/spec/models/form/lettings/questions/postcode_for_address_matcher_spec.rb
+++ b/spec/models/form/lettings/questions/postcode_for_address_matcher_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Form::Lettings::Questions::PostcodeForAddressMatcher, type: :mode
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/postcode_for_full_address_spec.rb b/spec/models/form/lettings/questions/postcode_for_full_address_spec.rb
index 1cb179ce5..0ccc8c26b 100644
--- a/spec/models/form/lettings/questions/postcode_for_full_address_spec.rb
+++ b/spec/models/form/lettings/questions/postcode_for_full_address_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Lettings::Questions::PostcodeForFullAddress, type: :model d
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/ppcodenk_spec.rb b/spec/models/form/lettings/questions/ppcodenk_spec.rb
index 79613d962..cc109c75f 100644
--- a/spec/models/form/lettings/questions/ppcodenk_spec.rb
+++ b/spec/models/form/lettings/questions/ppcodenk_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::Ppcodenk, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/previous_la_known_spec.rb b/spec/models/form/lettings/questions/previous_la_known_spec.rb
index 8b8460ce0..fea17d56a 100644
--- a/spec/models/form/lettings/questions/previous_la_known_spec.rb
+++ b/spec/models/form/lettings/questions/previous_la_known_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::PreviousLaKnown, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/previous_let_type_spec.rb b/spec/models/form/lettings/questions/previous_let_type_spec.rb
index 8b28bc93a..bf9cf78f9 100644
--- a/spec/models/form/lettings/questions/previous_let_type_spec.rb
+++ b/spec/models/form/lettings/questions/previous_let_type_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe Form::Lettings::Questions::PreviousLetType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer options" do
diff --git a/spec/models/form/lettings/questions/previous_tenure_renewal_spec.rb b/spec/models/form/lettings/questions/previous_tenure_renewal_spec.rb
index 8f7325334..724b6f143 100644
--- a/spec/models/form/lettings/questions/previous_tenure_renewal_spec.rb
+++ b/spec/models/form/lettings/questions/previous_tenure_renewal_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Form::Lettings::Questions::PreviousTenureRenewal, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/previous_tenure_spec.rb b/spec/models/form/lettings/questions/previous_tenure_spec.rb
index 2b46b4499..83c4d12de 100644
--- a/spec/models/form/lettings/questions/previous_tenure_spec.rb
+++ b/spec/models/form/lettings/questions/previous_tenure_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Form::Lettings::Questions::PreviousTenure, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/property_reference_spec.rb b/spec/models/form/lettings/questions/property_reference_spec.rb
index b4aa848af..2f0c21b75 100644
--- a/spec/models/form/lettings/questions/property_reference_spec.rb
+++ b/spec/models/form/lettings/questions/property_reference_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe Form::Lettings::Questions::PropertyReference, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "returns false for answer_selected" do
diff --git a/spec/models/form/lettings/questions/reasonpref_spec.rb b/spec/models/form/lettings/questions/reasonpref_spec.rb
index 1f531921d..ac39d8ba0 100644
--- a/spec/models/form/lettings/questions/reasonpref_spec.rb
+++ b/spec/models/form/lettings/questions/reasonpref_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::Reasonpref, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/renewal_spec.rb b/spec/models/form/lettings/questions/renewal_spec.rb
index 15b6fa84b..1b921070c 100644
--- a/spec/models/form/lettings/questions/renewal_spec.rb
+++ b/spec/models/form/lettings/questions/renewal_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe Form::Lettings::Questions::Renewal, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with collection year on or after 2024" do
diff --git a/spec/models/form/lettings/questions/rent_type_spec.rb b/spec/models/form/lettings/questions/rent_type_spec.rb
index bc66348f5..b4a65c4d6 100644
--- a/spec/models/form/lettings/questions/rent_type_spec.rb
+++ b/spec/models/form/lettings/questions/rent_type_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe Form::Lettings::Questions::RentType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the guidance partial" do
diff --git a/spec/models/form/lettings/questions/rsnvac_spec.rb b/spec/models/form/lettings/questions/rsnvac_spec.rb
index bdc84753d..8f796d548 100644
--- a/spec/models/form/lettings/questions/rsnvac_spec.rb
+++ b/spec/models/form/lettings/questions/rsnvac_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Rsnvac, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do
diff --git a/spec/models/form/lettings/questions/scheme_id_spec.rb b/spec/models/form/lettings/questions/scheme_id_spec.rb
index ec9283113..09272670d 100644
--- a/spec/models/form/lettings/questions/scheme_id_spec.rb
+++ b/spec/models/form/lettings/questions/scheme_id_spec.rb
@@ -61,7 +61,7 @@ RSpec.describe Form::Lettings::Questions::SchemeId, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct inferred_answers" do
diff --git a/spec/models/form/lettings/questions/sheltered_spec.rb b/spec/models/form/lettings/questions/sheltered_spec.rb
index c37646abb..15668648f 100644
--- a/spec/models/form/lettings/questions/sheltered_spec.rb
+++ b/spec/models/form/lettings/questions/sheltered_spec.rb
@@ -69,6 +69,6 @@ RSpec.describe Form::Lettings::Questions::Sheltered, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end
diff --git a/spec/models/form/lettings/questions/stock_owner_spec.rb b/spec/models/form/lettings/questions/stock_owner_spec.rb
index 376179cf2..af899e4ab 100644
--- a/spec/models/form/lettings/questions/stock_owner_spec.rb
+++ b/spec/models/form/lettings/questions/stock_owner_spec.rb
@@ -250,7 +250,7 @@ RSpec.describe Form::Lettings::Questions::StockOwner, type: :model do
   end
 
   it "is marked as derived" do
-    expect(question.derived?).to be true
+    expect(question.derived?(nil)).to be true
   end
 
   describe "#hidden_in_check_answers?" do
diff --git a/spec/models/form/lettings/questions/tenancy_length_spec.rb b/spec/models/form/lettings/questions/tenancy_length_spec.rb
index 2de7c99a6..4d1e9ec50 100644
--- a/spec/models/form/lettings/questions/tenancy_length_spec.rb
+++ b/spec/models/form/lettings/questions/tenancy_length_spec.rb
@@ -39,6 +39,6 @@ RSpec.describe Form::Lettings::Questions::TenancyLength, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end
diff --git a/spec/models/form/lettings/questions/tenancy_other_spec.rb b/spec/models/form/lettings/questions/tenancy_other_spec.rb
index 4891f5e31..554948ff3 100644
--- a/spec/models/form/lettings/questions/tenancy_other_spec.rb
+++ b/spec/models/form/lettings/questions/tenancy_other_spec.rb
@@ -30,6 +30,6 @@ RSpec.describe Form::Lettings::Questions::TenancyOther, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end
diff --git a/spec/models/form/lettings/questions/tenancy_start_date_spec.rb b/spec/models/form/lettings/questions/tenancy_start_date_spec.rb
index a6c96d989..35083ad01 100644
--- a/spec/models/form/lettings/questions/tenancy_start_date_spec.rb
+++ b/spec/models/form/lettings/questions/tenancy_start_date_spec.rb
@@ -28,6 +28,6 @@ RSpec.describe Form::Lettings::Questions::TenancyStartDate, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end
diff --git a/spec/models/form/lettings/questions/tenancy_type_spec.rb b/spec/models/form/lettings/questions/tenancy_type_spec.rb
index 6eafc96a7..196ec38bb 100644
--- a/spec/models/form/lettings/questions/tenancy_type_spec.rb
+++ b/spec/models/form/lettings/questions/tenancy_type_spec.rb
@@ -114,6 +114,6 @@ RSpec.describe Form::Lettings::Questions::TenancyType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end
diff --git a/spec/models/form/lettings/questions/tenant_code_spec.rb b/spec/models/form/lettings/questions/tenant_code_spec.rb
index dc6ed86d5..e5e434427 100644
--- a/spec/models/form/lettings/questions/tenant_code_spec.rb
+++ b/spec/models/form/lettings/questions/tenant_code_spec.rb
@@ -36,6 +36,6 @@ RSpec.describe Form::Lettings::Questions::TenantCode, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end
diff --git a/spec/models/form/lettings/questions/town_or_city_spec.rb b/spec/models/form/lettings/questions/town_or_city_spec.rb
index 61262055f..77867630f 100644
--- a/spec/models/form/lettings/questions/town_or_city_spec.rb
+++ b/spec/models/form/lettings/questions/town_or_city_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Lettings::Questions::TownOrCity, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/uprn_confirmation_spec.rb b/spec/models/form/lettings/questions/uprn_confirmation_spec.rb
index 92563b322..ee0235c54 100644
--- a/spec/models/form/lettings/questions/uprn_confirmation_spec.rb
+++ b/spec/models/form/lettings/questions/uprn_confirmation_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::UprnConfirmation, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/uprn_known_spec.rb b/spec/models/form/lettings/questions/uprn_known_spec.rb
index 94f99fe53..5f646e710 100644
--- a/spec/models/form/lettings/questions/uprn_known_spec.rb
+++ b/spec/models/form/lettings/questions/uprn_known_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::UprnKnown, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/uprn_selection_spec.rb b/spec/models/form/lettings/questions/uprn_selection_spec.rb
index de009a8c9..7ecd133ce 100644
--- a/spec/models/form/lettings/questions/uprn_selection_spec.rb
+++ b/spec/models/form/lettings/questions/uprn_selection_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe Form::Lettings::Questions::UprnSelection, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/lettings/questions/uprn_spec.rb b/spec/models/form/lettings/questions/uprn_spec.rb
index d02a3ff1f..17c36eb5f 100644
--- a/spec/models/form/lettings/questions/uprn_spec.rb
+++ b/spec/models/form/lettings/questions/uprn_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::Uprn, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct question_number" do
diff --git a/spec/models/form/lettings/questions/waityear_spec.rb b/spec/models/form/lettings/questions/waityear_spec.rb
index 7a322f864..5b30cd641 100644
--- a/spec/models/form/lettings/questions/waityear_spec.rb
+++ b/spec/models/form/lettings/questions/waityear_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::Waityear, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/lettings/questions/wheelchair_spec.rb b/spec/models/form/lettings/questions/wheelchair_spec.rb
index a5d240d51..d24320788 100644
--- a/spec/models/form/lettings/questions/wheelchair_spec.rb
+++ b/spec/models/form/lettings/questions/wheelchair_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe Form::Lettings::Questions::Wheelchair, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2024 form" do
diff --git a/spec/models/form/sales/questions/address_line1_for_address_matcher_spec.rb b/spec/models/form/sales/questions/address_line1_for_address_matcher_spec.rb
index 61bd183f0..213fddaf3 100644
--- a/spec/models/form/sales/questions/address_line1_for_address_matcher_spec.rb
+++ b/spec/models/form/sales/questions/address_line1_for_address_matcher_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe Form::Sales::Questions::AddressLine1ForAddressMatcher, type: :mod
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/armed_forces_spouse_spec.rb b/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
index f791f4339..92ae3df0c 100644
--- a/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
+++ b/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::ArmedForcesSpouse, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/buyer1_income_spec.rb b/spec/models/form/sales/questions/buyer1_income_spec.rb
index 78d184ca4..7bf56762b 100644
--- a/spec/models/form/sales/questions/buyer1_income_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_income_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Buyer1Income, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb
index d5e75e690..3ff9c7f3c 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundWhite, type: :model
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do
diff --git a/spec/models/form/sales/questions/buyer2_living_in_spec.rb b/spec/models/form/sales/questions/buyer2_living_in_spec.rb
index 48cb9d570..4de3f0bcf 100644
--- a/spec/models/form/sales/questions/buyer2_living_in_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_living_in_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Form::Sales::Questions::Buyer2LivingIn, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do
diff --git a/spec/models/form/sales/questions/fromprop_spec.rb b/spec/models/form/sales/questions/fromprop_spec.rb
index 184e9e90a..5660cbd91 100644
--- a/spec/models/form/sales/questions/fromprop_spec.rb
+++ b/spec/models/form/sales/questions/fromprop_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Fromprop, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/household_wheelchair_check_spec.rb b/spec/models/form/sales/questions/household_wheelchair_check_spec.rb
index d203ee444..a5e01a5f9 100644
--- a/spec/models/form/sales/questions/household_wheelchair_check_spec.rb
+++ b/spec/models/form/sales/questions/household_wheelchair_check_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::HouseholdWheelchairCheck, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/household_wheelchair_spec.rb b/spec/models/form/sales/questions/household_wheelchair_spec.rb
index 16c1cfc9e..0e12f37d0 100644
--- a/spec/models/form/sales/questions/household_wheelchair_spec.rb
+++ b/spec/models/form/sales/questions/household_wheelchair_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::HouseholdWheelchair, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/monthly_charges_value_check_spec.rb b/spec/models/form/sales/questions/monthly_charges_value_check_spec.rb
index a62bac569..d1c1b6884 100644
--- a/spec/models/form/sales/questions/monthly_charges_value_check_spec.rb
+++ b/spec/models/form/sales/questions/monthly_charges_value_check_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::MonthlyChargesValueCheck, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/mortgage_lender_other_spec.rb b/spec/models/form/sales/questions/mortgage_lender_other_spec.rb
index 8150c1088..e103b0ffd 100644
--- a/spec/models/form/sales/questions/mortgage_lender_other_spec.rb
+++ b/spec/models/form/sales/questions/mortgage_lender_other_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::MortgageLenderOther, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/multiple_partners_value_check_spec.rb b/spec/models/form/sales/questions/multiple_partners_value_check_spec.rb
index 7afda39bb..eb89dd910 100644
--- a/spec/models/form/sales/questions/multiple_partners_value_check_spec.rb
+++ b/spec/models/form/sales/questions/multiple_partners_value_check_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::MultiplePartnersValueCheck, type: :model
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/no_address_found_spec.rb b/spec/models/form/sales/questions/no_address_found_spec.rb
index 97881b2d7..6d6c2cea5 100644
--- a/spec/models/form/sales/questions/no_address_found_spec.rb
+++ b/spec/models/form/sales/questions/no_address_found_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe Form::Sales::Questions::NoAddressFound, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/outright_ownership_type_spec.rb b/spec/models/form/sales/questions/outright_ownership_type_spec.rb
index e3bd043b4..11e0b7b10 100644
--- a/spec/models/form/sales/questions/outright_ownership_type_spec.rb
+++ b/spec/models/form/sales/questions/outright_ownership_type_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Form::Sales::Questions::OutrightOwnershipType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/partner_under16_value_check_spec.rb b/spec/models/form/sales/questions/partner_under16_value_check_spec.rb
index 5be3aa9c7..638d49044 100644
--- a/spec/models/form/sales/questions/partner_under16_value_check_spec.rb
+++ b/spec/models/form/sales/questions/partner_under16_value_check_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::PartnerUnder16ValueCheck, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb b/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb
index 57914d70d..821eed3f5 100644
--- a/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Form::Sales::Questions::PersonRelationshipToBuyer1, type: :model
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has expected check answers card number" do
diff --git a/spec/models/form/sales/questions/person_working_situation_spec.rb b/spec/models/form/sales/questions/person_working_situation_spec.rb
index 97f438460..30974fba4 100644
--- a/spec/models/form/sales/questions/person_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/person_working_situation_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Form::Sales::Questions::PersonWorkingSituation, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/postcode_for_address_matcher_spec.rb b/spec/models/form/sales/questions/postcode_for_address_matcher_spec.rb
index 64a04be1b..e2a2931a9 100644
--- a/spec/models/form/sales/questions/postcode_for_address_matcher_spec.rb
+++ b/spec/models/form/sales/questions/postcode_for_address_matcher_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Form::Sales::Questions::PostcodeForAddressMatcher, type: :model d
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/previous_tenure_spec.rb b/spec/models/form/sales/questions/previous_tenure_spec.rb
index b0439d197..78b553e14 100644
--- a/spec/models/form/sales/questions/previous_tenure_spec.rb
+++ b/spec/models/form/sales/questions/previous_tenure_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::PreviousTenure, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/prevshared_spec.rb b/spec/models/form/sales/questions/prevshared_spec.rb
index 70b971401..9e6184b02 100644
--- a/spec/models/form/sales/questions/prevshared_spec.rb
+++ b/spec/models/form/sales/questions/prevshared_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Prevshared, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/privacy_notice_spec.rb b/spec/models/form/sales/questions/privacy_notice_spec.rb
index 879ca9a45..263623ea9 100644
--- a/spec/models/form/sales/questions/privacy_notice_spec.rb
+++ b/spec/models/form/sales/questions/privacy_notice_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/property_building_type_spec.rb b/spec/models/form/sales/questions/property_building_type_spec.rb
index e2c0f8aa3..39048845c 100644
--- a/spec/models/form/sales/questions/property_building_type_spec.rb
+++ b/spec/models/form/sales/questions/property_building_type_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::PropertyBuildingType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do
diff --git a/spec/models/form/sales/questions/property_unit_type_spec.rb b/spec/models/form/sales/questions/property_unit_type_spec.rb
index 524e077a4..69cb30ad1 100644
--- a/spec/models/form/sales/questions/property_unit_type_spec.rb
+++ b/spec/models/form/sales/questions/property_unit_type_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::PropertyUnitType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/sale_date_check_spec.rb b/spec/models/form/sales/questions/sale_date_check_spec.rb
index c37b2e870..c3342f04d 100644
--- a/spec/models/form/sales/questions/sale_date_check_spec.rb
+++ b/spec/models/form/sales/questions/sale_date_check_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::SaleDateCheck, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/savings_spec.rb b/spec/models/form/sales/questions/savings_spec.rb
index 61d97322c..632e5574f 100644
--- a/spec/models/form/sales/questions/savings_spec.rb
+++ b/spec/models/form/sales/questions/savings_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Savings, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/shared_ownership_type_spec.rb b/spec/models/form/sales/questions/shared_ownership_type_spec.rb
index 1700fb277..4771241e5 100644
--- a/spec/models/form/sales/questions/shared_ownership_type_spec.rb
+++ b/spec/models/form/sales/questions/shared_ownership_type_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Questions::SharedOwnershipType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do
diff --git a/spec/models/form/sales/questions/staircase_spec.rb b/spec/models/form/sales/questions/staircase_spec.rb
index a9c3b8722..a4b176d8a 100644
--- a/spec/models/form/sales/questions/staircase_spec.rb
+++ b/spec/models/form/sales/questions/staircase_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Staircase, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/uprn_selection_spec.rb b/spec/models/form/sales/questions/uprn_selection_spec.rb
index 1b9aaba39..621a3955e 100644
--- a/spec/models/form/sales/questions/uprn_selection_spec.rb
+++ b/spec/models/form/sales/questions/uprn_selection_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe Form::Sales::Questions::UprnSelection, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do
diff --git a/spec/models/form/sales/questions/value_spec.rb b/spec/models/form/sales/questions/value_spec.rb
index 3937aa1b8..ad3d2c4c9 100644
--- a/spec/models/form/sales/questions/value_spec.rb
+++ b/spec/models/form/sales/questions/value_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Value, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do