diff --git a/spec/models/form/sales/questions/address_line1_spec.rb b/spec/models/form/sales/questions/address_line1_spec.rb
index 12643a27d..b1eb2e6e4 100644
--- a/spec/models/form/sales/questions/address_line1_spec.rb
+++ b/spec/models/form/sales/questions/address_line1_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::AddressLine1, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/age1_spec.rb b/spec/models/form/sales/questions/age1_spec.rb
index b21277c54..a2aa0ab66 100644
--- a/spec/models/form/sales/questions/age1_spec.rb
+++ b/spec/models/form/sales/questions/age1_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Age1, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/age2_spec.rb b/spec/models/form/sales/questions/age2_spec.rb
index fc5dfa77a..f09148869 100644
--- a/spec/models/form/sales/questions/age2_spec.rb
+++ b/spec/models/form/sales/questions/age2_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Age2, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/armed_forces_spec.rb b/spec/models/form/sales/questions/armed_forces_spec.rb
index d84b9fbb5..14278b34f 100644
--- a/spec/models/form/sales/questions/armed_forces_spec.rb
+++ b/spec/models/form/sales/questions/armed_forces_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::ArmedForces, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
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 d3cc9bccc..f791f4339 100644
--- a/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
+++ b/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::ArmedForcesSpouse, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_age_known_spec.rb b/spec/models/form/sales/questions/buyer1_age_known_spec.rb
index 92af1bea5..f1b470435 100644
--- a/spec/models/form/sales/questions/buyer1_age_known_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_age_known_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1AgeKnown, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb
index 31df4708c..d77431d03 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundArab, type: :model
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb
index 931802fe5..1c8dc47cb 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundAsian, type: :model
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb
index 2722abf5b..cdb5eeed1 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundBlack, type: :model
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb
index f6fbdf3b0..51a1e705c 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundMixed, type: :model
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb
index a4a3a6ef6..ef0e9e9ff 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundWhite, type: :model
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(form).to receive(:start_year_after_2024?).and_return(false)
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb
index 8399bb839..65ee22933 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicGroup, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_income_known_spec.rb b/spec/models/form/sales/questions/buyer1_income_known_spec.rb
index 2abd58d3a..418f85683 100644
--- a/spec/models/form/sales/questions/buyer1_income_known_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_income_known_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1IncomeKnown, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_income_spec.rb b/spec/models/form/sales/questions/buyer1_income_spec.rb
index 8482f0558..78d184ca4 100644
--- a/spec/models/form/sales/questions/buyer1_income_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_income_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1Income, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb b/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb
index 7b8979d76..0563a3ea9 100644
--- a/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1LiveInProperty, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer1_mortgage_spec.rb b/spec/models/form/sales/questions/buyer1_mortgage_spec.rb
index df47cd1ce..7fc06c65a 100644
--- a/spec/models/form/sales/questions/buyer1_mortgage_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_mortgage_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1Mortgage, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:log) { create(:sales_log) }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/buyer1_nationality_spec.rb b/spec/models/form/sales/questions/buyer1_nationality_spec.rb
index 2e52016da..edbceddd7 100644
--- a/spec/models/form/sales/questions/buyer1_nationality_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_nationality_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe Form::Sales::Questions::Buyer1Nationality, type: :model do
   subject(:question) { described_class.new(nil, nil, page) }
 
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to be page
diff --git a/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb b/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
index f99b1c01f..bac8c46fe 100644
--- a/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe Form::Sales::Questions::Buyer1PreviousTenure, type: :model do
   subject(:question) { described_class.new(nil, nil, page) }
 
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:log) { create(:sales_log) }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/buyer1_working_situation_spec.rb b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
index ba7dcf00b..45bd0a8af 100644
--- a/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer1WorkingSituation, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_age_known_spec.rb b/spec/models/form/sales/questions/buyer2_age_known_spec.rb
index 7a06e4705..b3127b18e 100644
--- a/spec/models/form/sales/questions/buyer2_age_known_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_age_known_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2AgeKnown, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_arab_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_arab_spec.rb
index 0ec22b6bf..d078d1e7c 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_arab_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_arab_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundArab, type: :model
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_asian_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_asian_spec.rb
index 86a59b65f..b1bafa881 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_asian_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_asian_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundAsian, type: :model
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_black_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_black_spec.rb
index 873d43069..97bc3b349 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_black_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_black_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundBlack, type: :model
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_mixed_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_mixed_spec.rb
index 255251e90..ad02b97cc 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_mixed_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_mixed_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundMixed, type: :model
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
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 7e7bf66f7..d5e75e690 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
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundWhite, type: :model
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(form).to receive(:start_year_after_2024?).and_return(false)
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_group_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_group_spec.rb
index 82a7601bd..0369337ef 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_group_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_group_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicGroup, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_income_known_spec.rb b/spec/models/form/sales/questions/buyer2_income_known_spec.rb
index 6724b9b0d..37927f453 100644
--- a/spec/models/form/sales/questions/buyer2_income_known_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_income_known_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2IncomeKnown, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_income_spec.rb b/spec/models/form/sales/questions/buyer2_income_spec.rb
index 2a863f7cb..0eb92fad9 100644
--- a/spec/models/form/sales/questions/buyer2_income_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_income_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2Income, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb b/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb
index c2d276c44..3e27fa114 100644
--- a/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2LiveInProperty, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
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 4fca65f3f..48cb9d570 100644
--- a/spec/models/form/sales/questions/buyer2_living_in_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_living_in_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe Form::Sales::Questions::Buyer2LivingIn, type: :model do
   subject(:question) { described_class.new(nil, nil, page) }
 
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq page
diff --git a/spec/models/form/sales/questions/buyer2_mortgage_spec.rb b/spec/models/form/sales/questions/buyer2_mortgage_spec.rb
index 5bf83a2d0..174f5500a 100644
--- a/spec/models/form/sales/questions/buyer2_mortgage_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_mortgage_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2Mortgage, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:log) { create(:sales_log) }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/buyer2_nationality_spec.rb b/spec/models/form/sales/questions/buyer2_nationality_spec.rb
index ed1f96c28..f283b8496 100644
--- a/spec/models/form/sales/questions/buyer2_nationality_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_nationality_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe Form::Sales::Questions::Buyer2Nationality, type: :model do
   subject(:question) { described_class.new(nil, nil, page) }
 
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to be page
diff --git a/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb b/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
index 598d59f64..b37ce0e0e 100644
--- a/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2RelationshipToBuyer1, type: :model
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
index 8c864e8d7..eb6588416 100644
--- a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer_company_spec.rb b/spec/models/form/sales/questions/buyer_company_spec.rb
index 714aa0986..d11d7af84 100644
--- a/spec/models/form/sales/questions/buyer_company_spec.rb
+++ b/spec/models/form/sales/questions/buyer_company_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::BuyerCompany, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer_interview_spec.rb b/spec/models/form/sales/questions/buyer_interview_spec.rb
index ae706cb2f..a6c9ed1df 100644
--- a/spec/models/form/sales/questions/buyer_interview_spec.rb
+++ b/spec/models/form/sales/questions/buyer_interview_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::BuyerInterview, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyer_live_spec.rb b/spec/models/form/sales/questions/buyer_live_spec.rb
index cea2736e5..9fb657770 100644
--- a/spec/models/form/sales/questions/buyer_live_spec.rb
+++ b/spec/models/form/sales/questions/buyer_live_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::BuyerLive, type: :model do
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(form).to receive(:start_year_after_2024?).and_return(false)
diff --git a/spec/models/form/sales/questions/buyer_previous_spec.rb b/spec/models/form/sales/questions/buyer_previous_spec.rb
index e52a514d3..f330400f0 100644
--- a/spec/models/form/sales/questions/buyer_previous_spec.rb
+++ b/spec/models/form/sales/questions/buyer_previous_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::BuyerPrevious, type: :model do
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
   let(:joint_purchase) { true }
 
   before do
diff --git a/spec/models/form/sales/questions/buyer_still_serving_spec.rb b/spec/models/form/sales/questions/buyer_still_serving_spec.rb
index 887944a89..732228f17 100644
--- a/spec/models/form/sales/questions/buyer_still_serving_spec.rb
+++ b/spec/models/form/sales/questions/buyer_still_serving_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::BuyerStillServing, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/buyers_organisations_spec.rb b/spec/models/form/sales/questions/buyers_organisations_spec.rb
index b0c932acc..0c6cb737a 100644
--- a/spec/models/form/sales/questions/buyers_organisations_spec.rb
+++ b/spec/models/form/sales/questions/buyers_organisations_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::BuyersOrganisations, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/county_spec.rb b/spec/models/form/sales/questions/county_spec.rb
index 19bb59eb4..64bfab772 100644
--- a/spec/models/form/sales/questions/county_spec.rb
+++ b/spec/models/form/sales/questions/county_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::County, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/deposit_amount_spec.rb b/spec/models/form/sales/questions/deposit_amount_spec.rb
index 944cb2e44..578383f6b 100644
--- a/spec/models/form/sales/questions/deposit_amount_spec.rb
+++ b/spec/models/form/sales/questions/deposit_amount_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::DepositAmount, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/deposit_discount_spec.rb b/spec/models/form/sales/questions/deposit_discount_spec.rb
index b0f8899bf..552f31636 100644
--- a/spec/models/form/sales/questions/deposit_discount_spec.rb
+++ b/spec/models/form/sales/questions/deposit_discount_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::DepositDiscount, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/discount_spec.rb b/spec/models/form/sales/questions/discount_spec.rb
index c3b7d24a1..59d1f5d62 100644
--- a/spec/models/form/sales/questions/discount_spec.rb
+++ b/spec/models/form/sales/questions/discount_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::Discount, type: :model do
 
   before do
     allow(page).to receive(:subsection).and_return(subsection)
-    allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false))
+    allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
   end
 
   it "has correct page" do
@@ -61,7 +61,7 @@ RSpec.describe Form::Sales::Questions::Discount, type: :model do
 
   context "with form start year after 2024" do
     before do
-      allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: true))
+      allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: true, start_date: Time.zone.local(2024, 4, 1)))
     end
 
     it "has correct max" do
diff --git a/spec/models/form/sales/questions/equity_spec.rb b/spec/models/form/sales/questions/equity_spec.rb
index 91308c745..b54366114 100644
--- a/spec/models/form/sales/questions/equity_spec.rb
+++ b/spec/models/form/sales/questions/equity_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Equity, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/exchange_date_spec.rb b/spec/models/form/sales/questions/exchange_date_spec.rb
index 53d5a8975..a1d2a56b9 100644
--- a/spec/models/form/sales/questions/exchange_date_spec.rb
+++ b/spec/models/form/sales/questions/exchange_date_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::ExchangeDate, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/extra_borrowing_spec.rb b/spec/models/form/sales/questions/extra_borrowing_spec.rb
index cc0656031..77b36038a 100644
--- a/spec/models/form/sales/questions/extra_borrowing_spec.rb
+++ b/spec/models/form/sales/questions/extra_borrowing_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::ExtraBorrowing, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/fromprop_spec.rb b/spec/models/form/sales/questions/fromprop_spec.rb
index c9aaa60b9..184e9e90a 100644
--- a/spec/models/form/sales/questions/fromprop_spec.rb
+++ b/spec/models/form/sales/questions/fromprop_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Fromprop, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/gender_identity1_spec.rb b/spec/models/form/sales/questions/gender_identity1_spec.rb
index e7f07577c..a3049fcc2 100644
--- a/spec/models/form/sales/questions/gender_identity1_spec.rb
+++ b/spec/models/form/sales/questions/gender_identity1_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::GenderIdentity1, type: :model do
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(page).to receive(:subsection).and_return(subsection)
diff --git a/spec/models/form/sales/questions/gender_identity2_spec.rb b/spec/models/form/sales/questions/gender_identity2_spec.rb
index 28a828155..334ce23f1 100644
--- a/spec/models/form/sales/questions/gender_identity2_spec.rb
+++ b/spec/models/form/sales/questions/gender_identity2_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::GenderIdentity2, type: :model do
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(page).to receive(:subsection).and_return(subsection)
diff --git a/spec/models/form/sales/questions/grant_spec.rb b/spec/models/form/sales/questions/grant_spec.rb
index cd74ee704..656658881 100644
--- a/spec/models/form/sales/questions/grant_spec.rb
+++ b/spec/models/form/sales/questions/grant_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Grant, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/handover_date_spec.rb b/spec/models/form/sales/questions/handover_date_spec.rb
index 43fa7f665..4630f0772 100644
--- a/spec/models/form/sales/questions/handover_date_spec.rb
+++ b/spec/models/form/sales/questions/handover_date_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::HandoverDate, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/household_disability_spec.rb b/spec/models/form/sales/questions/household_disability_spec.rb
index 38134344c..db9e8e592 100644
--- a/spec/models/form/sales/questions/household_disability_spec.rb
+++ b/spec/models/form/sales/questions/household_disability_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::HouseholdDisability, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/household_wheelchair_spec.rb b/spec/models/form/sales/questions/household_wheelchair_spec.rb
index 8d641aef7..16c1cfc9e 100644
--- a/spec/models/form/sales/questions/household_wheelchair_spec.rb
+++ b/spec/models/form/sales/questions/household_wheelchair_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::HouseholdWheelchair, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/housing_benefits_spec.rb b/spec/models/form/sales/questions/housing_benefits_spec.rb
index 12ae84774..20266fd49 100644
--- a/spec/models/form/sales/questions/housing_benefits_spec.rb
+++ b/spec/models/form/sales/questions/housing_benefits_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::HousingBenefits, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:joint_purchase) { false }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/joint_purchase_spec.rb b/spec/models/form/sales/questions/joint_purchase_spec.rb
index fcd3b72e5..e5d991c19 100644
--- a/spec/models/form/sales/questions/joint_purchase_spec.rb
+++ b/spec/models/form/sales/questions/joint_purchase_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::JointPurchase, type: :model do
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(page).to receive(:subsection).and_return(subsection)
diff --git a/spec/models/form/sales/questions/la_nominations_spec.rb b/spec/models/form/sales/questions/la_nominations_spec.rb
index bb06ef014..61cf30ac8 100644
--- a/spec/models/form/sales/questions/la_nominations_spec.rb
+++ b/spec/models/form/sales/questions/la_nominations_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::LaNominations, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/leasehold_charges_spec.rb b/spec/models/form/sales/questions/leasehold_charges_spec.rb
index c1fb1a0fa..86146cba6 100644
--- a/spec/models/form/sales/questions/leasehold_charges_spec.rb
+++ b/spec/models/form/sales/questions/leasehold_charges_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::LeaseholdCharges, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/living_before_purchase_spec.rb b/spec/models/form/sales/questions/living_before_purchase_spec.rb
index 86bbb12de..609f75761 100644
--- a/spec/models/form/sales/questions/living_before_purchase_spec.rb
+++ b/spec/models/form/sales/questions/living_before_purchase_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::LivingBeforePurchase, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/managing_organisation_spec.rb b/spec/models/form/sales/questions/managing_organisation_spec.rb
index 98f459b24..f708d7d74 100644
--- a/spec/models/form/sales/questions/managing_organisation_spec.rb
+++ b/spec/models/form/sales/questions/managing_organisation_spec.rb
@@ -5,9 +5,7 @@ RSpec.describe Form::Sales::Questions::ManagingOrganisation, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
-  let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/monthly_rent_spec.rb b/spec/models/form/sales/questions/monthly_rent_spec.rb
index e33603099..6c349a7fb 100644
--- a/spec/models/form/sales/questions/monthly_rent_spec.rb
+++ b/spec/models/form/sales/questions/monthly_rent_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::MonthlyRent, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/mortgage_amount_spec.rb b/spec/models/form/sales/questions/mortgage_amount_spec.rb
index 758101867..2732bda50 100644
--- a/spec/models/form/sales/questions/mortgage_amount_spec.rb
+++ b/spec/models/form/sales/questions/mortgage_amount_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::MortgageAmount, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to be(page)
diff --git a/spec/models/form/sales/questions/mortgage_lender_spec.rb b/spec/models/form/sales/questions/mortgage_lender_spec.rb
index e50dafb2b..baac7c9d1 100644
--- a/spec/models/form/sales/questions/mortgage_lender_spec.rb
+++ b/spec/models/form/sales/questions/mortgage_lender_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::MortgageLender, type: :model do
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(form).to receive(:start_year_after_2024?)
diff --git a/spec/models/form/sales/questions/mortgage_length_spec.rb b/spec/models/form/sales/questions/mortgage_length_spec.rb
index 5af0d7662..989cb2c0b 100644
--- a/spec/models/form/sales/questions/mortgage_length_spec.rb
+++ b/spec/models/form/sales/questions/mortgage_length_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::MortgageLength, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/mortgageused_spec.rb b/spec/models/form/sales/questions/mortgageused_spec.rb
index 60c51acd9..4c1dbd8dc 100644
--- a/spec/models/form/sales/questions/mortgageused_spec.rb
+++ b/spec/models/form/sales/questions/mortgageused_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Mortgageused, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:log) { create(:sales_log) }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/number_joint_buyers_spec.rb b/spec/models/form/sales/questions/number_joint_buyers_spec.rb
index 5340841c6..b782ba689 100644
--- a/spec/models/form/sales/questions/number_joint_buyers_spec.rb
+++ b/spec/models/form/sales/questions/number_joint_buyers_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::NumberJointBuyers, type: :model do
 
   before do
     allow(page).to receive(:subsection).and_return(subsection)
-    allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false))
+    allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
   end
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/number_of_others_in_property_spec.rb b/spec/models/form/sales/questions/number_of_others_in_property_spec.rb
index 3d6e9d9c5..66abad48c 100644
--- a/spec/models/form/sales/questions/number_of_others_in_property_spec.rb
+++ b/spec/models/form/sales/questions/number_of_others_in_property_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::NumberOfOthersInProperty, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:joint_purchase) { true }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/other_ownership_type_spec.rb b/spec/models/form/sales/questions/other_ownership_type_spec.rb
index 0929e7d8a..e3986fcab 100644
--- a/spec/models/form/sales/questions/other_ownership_type_spec.rb
+++ b/spec/models/form/sales/questions/other_ownership_type_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::OtherOwnershipType, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/ownership_scheme_spec.rb b/spec/models/form/sales/questions/ownership_scheme_spec.rb
index ec104682b..c3b635354 100644
--- a/spec/models/form/sales/questions/ownership_scheme_spec.rb
+++ b/spec/models/form/sales/questions/ownership_scheme_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::OwnershipScheme, type: :model do
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(form).to receive(:start_year_after_2024?).and_return(false)
diff --git a/spec/models/form/sales/questions/owning_organisation_id_spec.rb b/spec/models/form/sales/questions/owning_organisation_id_spec.rb
index 20ce635a4..929221a8c 100644
--- a/spec/models/form/sales/questions/owning_organisation_id_spec.rb
+++ b/spec/models/form/sales/questions/owning_organisation_id_spec.rb
@@ -6,9 +6,7 @@ RSpec.describe Form::Sales::Questions::OwningOrganisationId, type: :model do
   let(:user) { FactoryBot.create(:user, :data_coordinator) }
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
-  let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let!(:organisation_1) { FactoryBot.create(:organisation, name: "first test org") }
   let!(:organisation_2) { FactoryBot.create(:organisation, name: "second test org") }
   let(:lettings_log) { FactoryBot.create(:lettings_log) }
diff --git a/spec/models/form/sales/questions/postcode_for_full_address_spec.rb b/spec/models/form/sales/questions/postcode_for_full_address_spec.rb
index a3c8ddfb8..3c912c188 100644
--- a/spec/models/form/sales/questions/postcode_for_full_address_spec.rb
+++ b/spec/models/form/sales/questions/postcode_for_full_address_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PostcodeForFullAddress, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/previous_bedrooms_spec.rb b/spec/models/form/sales/questions/previous_bedrooms_spec.rb
index 1798e23fa..da7f5de5d 100644
--- a/spec/models/form/sales/questions/previous_bedrooms_spec.rb
+++ b/spec/models/form/sales/questions/previous_bedrooms_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PreviousBedrooms, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/previous_la_known_spec.rb b/spec/models/form/sales/questions/previous_la_known_spec.rb
index 9e369af0a..5b2b6c396 100644
--- a/spec/models/form/sales/questions/previous_la_known_spec.rb
+++ b/spec/models/form/sales/questions/previous_la_known_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PreviousLaKnown, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/previous_postcode_known_spec.rb b/spec/models/form/sales/questions/previous_postcode_known_spec.rb
index b1d244b1e..42f5ff67d 100644
--- a/spec/models/form/sales/questions/previous_postcode_known_spec.rb
+++ b/spec/models/form/sales/questions/previous_postcode_known_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PreviousPostcodeKnown, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/previous_postcode_spec.rb b/spec/models/form/sales/questions/previous_postcode_spec.rb
index a452d9efa..ed7c4c60b 100644
--- a/spec/models/form/sales/questions/previous_postcode_spec.rb
+++ b/spec/models/form/sales/questions/previous_postcode_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PreviousPostcode, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb b/spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
index 713d4b3e8..4e7475fde 100644
--- a/spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
+++ b/spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe Form::Sales::Questions::PreviousTenureBuyer2, type: :model do
   subject(:question) { described_class.new(nil, nil, page) }
 
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/previous_tenure_spec.rb b/spec/models/form/sales/questions/previous_tenure_spec.rb
index fde61271f..b0439d197 100644
--- a/spec/models/form/sales/questions/previous_tenure_spec.rb
+++ b/spec/models/form/sales/questions/previous_tenure_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PreviousTenure, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/prevown_spec.rb b/spec/models/form/sales/questions/prevown_spec.rb
index d7b101c99..f813d22ec 100644
--- a/spec/models/form/sales/questions/prevown_spec.rb
+++ b/spec/models/form/sales/questions/prevown_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Prevown, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:joint_purchase) { false }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/prevshared_spec.rb b/spec/models/form/sales/questions/prevshared_spec.rb
index 11a3f85c2..70b971401 100644
--- a/spec/models/form/sales/questions/prevshared_spec.rb
+++ b/spec/models/form/sales/questions/prevshared_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Prevshared, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/privacy_notice_spec.rb b/spec/models/form/sales/questions/privacy_notice_spec.rb
index b0d35a615..95f2de544 100644
--- a/spec/models/form/sales/questions/privacy_notice_spec.rb
+++ b/spec/models/form/sales/questions/privacy_notice_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(form).to receive(:start_year_after_2024?)
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 9b8f94b5f..e2c0f8aa3 100644
--- a/spec/models/form/sales/questions/property_building_type_spec.rb
+++ b/spec/models/form/sales/questions/property_building_type_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PropertyBuildingType, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb b/spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb
index cad7cb004..98a219859 100644
--- a/spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb
+++ b/spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PropertyNumberOfBedrooms, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
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 967ffe32d..524e077a4 100644
--- a/spec/models/form/sales/questions/property_unit_type_spec.rb
+++ b/spec/models/form/sales/questions/property_unit_type_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PropertyUnitType, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb b/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
index 9fd7be4a6..f6ec156e6 100644
--- a/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Form::Sales::Questions::PropertyWheelchairAccessible, type: :mode
 
   before do
     allow(page).to receive(:subsection).and_return(subsection)
-    allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false))
+    allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false, start_date: Time.zone.local(2023, 4, 1)))
   end
 
   it "has correct page" do
@@ -47,7 +47,7 @@ RSpec.describe Form::Sales::Questions::PropertyWheelchairAccessible, type: :mode
 
   context "with 2024 form" do
     before do
-      allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: true))
+      allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: true, start_date: Time.zone.local(2024, 4, 1)))
     end
 
     it "has the correct hint_text" do
diff --git a/spec/models/form/sales/questions/purchase_price_spec.rb b/spec/models/form/sales/questions/purchase_price_spec.rb
index a6a4f6cbe..7dde97940 100644
--- a/spec/models/form/sales/questions/purchase_price_spec.rb
+++ b/spec/models/form/sales/questions/purchase_price_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PurchasePrice, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/purchaser_code_spec.rb b/spec/models/form/sales/questions/purchaser_code_spec.rb
index 8f75d676b..96a18f7d9 100644
--- a/spec/models/form/sales/questions/purchaser_code_spec.rb
+++ b/spec/models/form/sales/questions/purchaser_code_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PurchaserCode, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/resale_spec.rb b/spec/models/form/sales/questions/resale_spec.rb
index a52999fbb..29927f61b 100644
--- a/spec/models/form/sales/questions/resale_spec.rb
+++ b/spec/models/form/sales/questions/resale_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Resale, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/sale_date_spec.rb b/spec/models/form/sales/questions/sale_date_spec.rb
index 0f368abbb..3bffee4d8 100644
--- a/spec/models/form/sales/questions/sale_date_spec.rb
+++ b/spec/models/form/sales/questions/sale_date_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::SaleDate, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/savings_nk_spec.rb b/spec/models/form/sales/questions/savings_nk_spec.rb
index 25525e861..90134413f 100644
--- a/spec/models/form/sales/questions/savings_nk_spec.rb
+++ b/spec/models/form/sales/questions/savings_nk_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::SavingsNk, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/savings_spec.rb b/spec/models/form/sales/questions/savings_spec.rb
index d416c1e73..61d97322c 100644
--- a/spec/models/form/sales/questions/savings_spec.rb
+++ b/spec/models/form/sales/questions/savings_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Savings, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/staircase_bought_spec.rb b/spec/models/form/sales/questions/staircase_bought_spec.rb
index 7b877cc26..027619751 100644
--- a/spec/models/form/sales/questions/staircase_bought_spec.rb
+++ b/spec/models/form/sales/questions/staircase_bought_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::StaircaseBought, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/staircase_owned_spec.rb b/spec/models/form/sales/questions/staircase_owned_spec.rb
index 8e78d540a..e74bb2ecf 100644
--- a/spec/models/form/sales/questions/staircase_owned_spec.rb
+++ b/spec/models/form/sales/questions/staircase_owned_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::StaircaseOwned, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:joint_purchase) { false }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/staircase_sale_spec.rb b/spec/models/form/sales/questions/staircase_sale_spec.rb
index 39927c967..5e373ca4e 100644
--- a/spec/models/form/sales/questions/staircase_sale_spec.rb
+++ b/spec/models/form/sales/questions/staircase_sale_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::StaircaseSale, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/staircase_spec.rb b/spec/models/form/sales/questions/staircase_spec.rb
index 845e5242e..a9c3b8722 100644
--- a/spec/models/form/sales/questions/staircase_spec.rb
+++ b/spec/models/form/sales/questions/staircase_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Staircase, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/town_or_city_spec.rb b/spec/models/form/sales/questions/town_or_city_spec.rb
index df1c905b4..4905f44d6 100644
--- a/spec/models/form/sales/questions/town_or_city_spec.rb
+++ b/spec/models/form/sales/questions/town_or_city_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::TownOrCity, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/uprn_spec.rb b/spec/models/form/sales/questions/uprn_spec.rb
index e08ac4d07..217011661 100644
--- a/spec/models/form/sales/questions/uprn_spec.rb
+++ b/spec/models/form/sales/questions/uprn_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Uprn, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)
diff --git a/spec/models/form/sales/questions/value_spec.rb b/spec/models/form/sales/questions/value_spec.rb
index f9da45db0..3937aa1b8 100644
--- a/spec/models/form/sales/questions/value_spec.rb
+++ b/spec/models/form/sales/questions/value_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::Value, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)