diff --git a/spec/services/bulk_upload/lettings/validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb
index 12d53136e..01332e00b 100644
--- a/spec/services/bulk_upload/lettings/validator_spec.rb
+++ b/spec/services/bulk_upload/lettings/validator_spec.rb
@@ -6,96 +6,182 @@ RSpec.describe BulkUpload::Lettings::Validator do
   let(:organisation) { create(:organisation, old_visible_id: "3") }
   let(:user) { create(:user, organisation:) }
   let(:log) { build(:lettings_log, :completed) }
-  let(:bulk_upload) { create(:bulk_upload, user:, year: 2022) }
+  let(:bulk_upload) { create(:bulk_upload, user:) }
   let(:path) { file.path }
   let(:file) { Tempfile.new }
 
   describe "validations" do
-    let(:bulk_upload) { create(:bulk_upload, user:, year: 2023) }
-
     context "when file is empty" do
       it "is not valid" do
         expect(validator).not_to be_valid
       end
     end
 
-    context "when file has no headers and too many columns" do
-      before do
-        file.write(("a" * 143).chars.join(","))
-        file.write("\n")
-        file.rewind
-      end
+    context "2022" do
+      let(:bulk_upload) { create(:bulk_upload, user:, year: 2022) }
 
-      it "is not valid" do
-        expect(validator).not_to be_valid
-        expect(validator.errors["base"]).to eql(["too many columns, please ensure you have used the correct template"])
+      context "when file has no headers and too many columns" do
+        before do
+          file.write(("a" * 136).chars.join(","))
+          file.write("\n")
+          file.rewind
+        end
+
+        it "is not valid" do
+          expect(validator).not_to be_valid
+          expect(validator.errors["base"]).to eql(["too many columns, please ensure you have used the correct template"])
+        end
       end
-    end
 
-    context "when file has no headers and doesn't have too many columns" do
-      before do
-        file.write(("a" * 142).chars.join(","))
-        file.write("\n")
-        file.rewind
+      context "when file has no headers and doesn't have too many columns" do
+        before do
+          file.write(("a" * 135).chars.join(","))
+          file.write("\n")
+          file.rewind
+        end
+
+        it "is valid" do
+          expect(validator).to be_valid
+        end
       end
 
-      it "is valid" do
-        expect(validator).to be_valid
+      context "when file has extra invalid headers" do
+        let(:seed) { rand }
+        let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) }
+        let(:field_numbers) { log_to_csv.default_2022_field_numbers + %w[invalid_field_number] }
+        let(:field_values) { log_to_csv.to_2022_row + %w[value_for_invalid_field_number] }
+
+        before do
+          file.write(log_to_csv.custom_2022_field_numbers_row(seed:, field_numbers:))
+          file.write(log_to_csv.to_custom_2022_csv_row(seed:, field_values:))
+          file.rewind
+        end
+
+        it "is valid" do
+          expect(validator).to be_valid
+        end
       end
-    end
 
-    context "when file has extra invalid headers" do
-      let(:seed) { rand }
-      let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) }
-      let(:field_numbers) { log_to_csv.default_2023_field_numbers + %w[invalid_field_number] }
-      let(:field_values) { log_to_csv.to_2023_row + %w[value_for_invalid_field_number] }
+      context "when file has too few valid headers" do
+        let(:seed) { rand }
+        let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) }
+        let(:field_numbers) { log_to_csv.default_2022_field_numbers }
+        let(:field_values) { log_to_csv.to_2022_row }
 
-      before do
-        file.write(log_to_csv.custom_2023_field_numbers_row(seed:, field_numbers:))
-        file.write(log_to_csv.to_custom_2023_csv_row(seed:, field_values:))
-        file.rewind
+        before do
+          field_numbers.delete_at(20)
+          field_values.delete_at(20)
+          file.write(log_to_csv.custom_2022_field_numbers_row(seed:, field_numbers:))
+          file.write(log_to_csv.to_custom_2022_csv_row(seed:, field_values:))
+          file.rewind
+        end
+
+        it "is not valid" do
+          expect(validator).not_to be_valid
+          expect(validator.errors["base"]).to eql(["incorrect number of fields, please ensure you have used the correct template"])
+        end
       end
 
-      it "is valid" do
-        expect(validator).to be_valid
+      context "when file has too many valid headers" do
+        let(:seed) { rand }
+        let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) }
+        let(:field_numbers) { log_to_csv.default_2022_field_numbers + %w[23] }
+        let(:field_values) { log_to_csv.to_2022_row + %w[value] }
+
+        before do
+          file.write(log_to_csv.custom_2022_field_numbers_row(seed:, field_numbers:))
+          file.write(log_to_csv.to_custom_2022_csv_row(seed:, field_values:))
+          file.rewind
+        end
+
+        it "is not valid" do
+          expect(validator).not_to be_valid
+          expect(validator.errors["base"]).to eql(["incorrect number of fields, please ensure you have used the correct template"])
+        end
       end
     end
 
-    context "when file has too few valid headers" do
-      let(:seed) { rand }
-      let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) }
-      let(:field_numbers) { log_to_csv.default_2023_field_numbers }
-      let(:field_values) { log_to_csv.to_2023_row }
+    context "2023" do
+      let(:bulk_upload) { create(:bulk_upload, user:, year: 2023) }
 
-      before do
-        field_numbers.delete_at(20)
-        field_values.delete_at(20)
-        file.write(log_to_csv.custom_2023_field_numbers_row(seed:, field_numbers:))
-        file.write(log_to_csv.to_custom_2023_csv_row(seed:, field_values:))
-        file.rewind
+      context "when file has no headers and too many columns" do
+        before do
+          file.write(("a" * 143).chars.join(","))
+          file.write("\n")
+          file.rewind
+        end
+
+        it "is not valid" do
+          expect(validator).not_to be_valid
+          expect(validator.errors["base"]).to eql(["too many columns, please ensure you have used the correct template"])
+        end
       end
 
-      it "is not valid" do
-        expect(validator).not_to be_valid
-        expect(validator.errors["base"]).to eql(["incorrect number of fields, please ensure you have used the correct template"])
+      context "when file has no headers and doesn't have too many columns" do
+        before do
+          file.write(("a" * 142).chars.join(","))
+          file.write("\n")
+          file.rewind
+        end
+
+        it "is valid" do
+          expect(validator).to be_valid
+        end
       end
-    end
 
-    context "when file has too many valid headers" do
-      let(:seed) { rand }
-      let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) }
-      let(:field_numbers) { log_to_csv.default_2023_field_numbers + %w[23] }
-      let(:field_values) { log_to_csv.to_2023_row + %w[value] }
+      context "when file has extra invalid headers" do
+        let(:seed) { rand }
+        let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) }
+        let(:field_numbers) { log_to_csv.default_2023_field_numbers + %w[invalid_field_number] }
+        let(:field_values) { log_to_csv.to_2023_row + %w[value_for_invalid_field_number] }
 
-      before do
-        file.write(log_to_csv.custom_2023_field_numbers_row(seed:, field_numbers:))
-        file.write(log_to_csv.to_custom_2023_csv_row(seed:, field_values:))
-        file.rewind
+        before do
+          file.write(log_to_csv.custom_2023_field_numbers_row(seed:, field_numbers:))
+          file.write(log_to_csv.to_custom_2023_csv_row(seed:, field_values:))
+          file.rewind
+        end
+
+        it "is valid" do
+          expect(validator).to be_valid
+        end
       end
 
-      it "is not valid" do
-        expect(validator).not_to be_valid
-        expect(validator.errors["base"]).to eql(["incorrect number of fields, please ensure you have used the correct template"])
+      context "when file has too few valid headers" do
+        let(:seed) { rand }
+        let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) }
+        let(:field_numbers) { log_to_csv.default_2023_field_numbers }
+        let(:field_values) { log_to_csv.to_2023_row }
+
+        before do
+          field_numbers.delete_at(20)
+          field_values.delete_at(20)
+          file.write(log_to_csv.custom_2023_field_numbers_row(seed:, field_numbers:))
+          file.write(log_to_csv.to_custom_2023_csv_row(seed:, field_values:))
+          file.rewind
+        end
+
+        it "is not valid" do
+          expect(validator).not_to be_valid
+          expect(validator.errors["base"]).to eql(["incorrect number of fields, please ensure you have used the correct template"])
+        end
+      end
+
+      context "when file has too many valid headers" do
+        let(:seed) { rand }
+        let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) }
+        let(:field_numbers) { log_to_csv.default_2023_field_numbers + %w[23] }
+        let(:field_values) { log_to_csv.to_2023_row + %w[value] }
+
+        before do
+          file.write(log_to_csv.custom_2023_field_numbers_row(seed:, field_numbers:))
+          file.write(log_to_csv.to_custom_2023_csv_row(seed:, field_values:))
+          file.rewind
+        end
+
+        it "is not valid" do
+          expect(validator).not_to be_valid
+          expect(validator.errors["base"]).to eql(["incorrect number of fields, please ensure you have used the correct template"])
+        end
       end
     end
 
diff --git a/spec/support/bulk_upload/log_to_csv.rb b/spec/support/bulk_upload/log_to_csv.rb
index 19e2b2630..456610c3d 100644
--- a/spec/support/bulk_upload/log_to_csv.rb
+++ b/spec/support/bulk_upload/log_to_csv.rb
@@ -16,6 +16,26 @@ class BulkUpload::LogToCsv
     (row_prefix + to_2022_row).flatten.join(",") + line_ending
   end
 
+  def to_custom_2022_csv_row(seed: nil, field_values: to_2022_row)
+    if seed
+      row = field_values.shuffle(random: Random.new(seed))
+    end
+    (row_prefix + row).flatten.join(",") + line_ending
+  end
+
+
+  def default_2022_field_numbers
+    (1..134).to_a
+  end
+
+  def custom_2022_field_numbers_row(seed: nil, field_numbers: default_2022_field_numbers)
+    if seed
+      ["Bulk upload field number"] + field_numbers.shuffle(random: Random.new(seed))
+    else
+      ["Bulk upload field number"] + field_numbers
+    end.flatten.join(",") + line_ending
+  end
+
   def to_2023_csv_row(seed: nil)
     if seed
       row = to_2023_row.shuffle(random: Random.new(seed))