diff --git a/app/models/validations/sales/setup_validations.rb b/app/models/validations/sales/setup_validations.rb
index 22b686ee5..58ed7b06f 100644
--- a/app/models/validations/sales/setup_validations.rb
+++ b/app/models/validations/sales/setup_validations.rb
@@ -1,4 +1,5 @@
 module Validations::Sales::SetupValidations
+  include Validations::SharedValidations
   def validate_saledate(record)
     return unless record.saledate && date_valid?("saledate", record)
 
diff --git a/db/schema.rb b/db/schema.rb
index dc431d425..156b85ba0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -504,11 +504,11 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_26_145529) do
     t.integer "retirement_value_check"
     t.integer "hodate_check"
     t.integer "extrabor_value_check"
-    t.integer "grant_value_check"
-    t.integer "staircase_bought_value_check"
     t.integer "deposit_and_mortgage_value_check"
     t.integer "shared_ownership_deposit_value_check"
+    t.integer "grant_value_check"
     t.integer "old_persons_shared_ownership_value_check"
+    t.integer "staircase_bought_value_check"
     t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
     t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"
diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb
index 59a091260..d577f2e5d 100644
--- a/spec/models/form/sales/subsections/setup_spec.rb
+++ b/spec/models/form/sales/subsections/setup_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
         organisation
         created_by
         completion_date
-        handover_date_sale_daet_check
+        handover_date_sale_date_check
         purchaser_code
         ownership_scheme
         shared_ownership_type
diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb
index be88b2b94..9dc01e02f 100644
--- a/spec/models/form_handler_spec.rb
+++ b/spec/models/form_handler_spec.rb
@@ -52,14 +52,14 @@ RSpec.describe FormHandler do
     it "is able to load a current sales form" do
       form = form_handler.get_form("current_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(198)
+      expect(form.pages.count).to eq(199)
       expect(form.name).to eq("2022_2023_sales")
     end
 
     it "is able to load a previous sales form" do
       form = form_handler.get_form("previous_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(198)
+      expect(form.pages.count).to eq(199)
       expect(form.name).to eq("2021_2022_sales")
     end
   end
diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb
index fee42f1bc..71dfd4b60 100644
--- a/spec/models/form_spec.rb
+++ b/spec/models/form_spec.rb
@@ -218,9 +218,9 @@ RSpec.describe Form, type: :model do
       expect(form.sections[0].class).to eq(Form::Sales::Sections::Setup)
       expect(form.subsections.count).to eq(1)
       expect(form.subsections.first.id).to eq("setup")
-      expect(form.pages.count).to eq(13)
+      expect(form.pages.count).to eq(14)
       expect(form.pages.first.id).to eq("organisation")
-      expect(form.questions.count).to eq(14)
+      expect(form.questions.count).to eq(15)
       expect(form.questions.first.id).to eq("owning_organisation_id")
       expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
       expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))
diff --git a/spec/models/validations/sales/sale_information_validations_spec.rb b/spec/models/validations/sales/sale_information_validations_spec.rb
index 7ca507c1d..055d749ae 100644
--- a/spec/models/validations/sales/sale_information_validations_spec.rb
+++ b/spec/models/validations/sales/sale_information_validations_spec.rb
@@ -62,7 +62,7 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
       it "does not add an error" do
         sale_information_validator.validate_practical_completion_date_before_saledate(record)
 
-        expect(record.errors[:hodate]).to be_present
+        expect(record.errors[:hodate]).not_to be_present
       end
     end
   end
@@ -130,10 +130,10 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
         sale_information_validator.validate_exchange_date(record)
 
         expect(record.errors[:exdate]).to eq(
-          ["Contract exchange date must be less than 1 year before completion date"],
+          ["Contract exchange date must be before completion date"],
         )
         expect(record.errors[:saledate]).to eq(
-          ["Completion date must be less than 1 year after contract exchange date"],
+          ["Completion date must be after contract exchange date"],
         )
       end
     end