diff --git a/.erb-lint.yml b/.erb_lint.yml
similarity index 100%
rename from .erb-lint.yml
rename to .erb_lint.yml
diff --git a/.rubocop.yml b/.rubocop.yml
index 7bc65bbd8..4a54015a2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,7 @@
 require:
   - rubocop-performance
+
+plugins:
   - rubocop-rails
   - rubocop-rspec
 
@@ -28,3 +30,6 @@ Rails/UnknownEnv:
     - development
     - test
     - review
+
+RSpec/IndexedLet:
+  Enabled: false
diff --git a/.ruby-version b/.ruby-version
index 9cec7165a..f9892605c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.6
+3.4.4
diff --git a/Dockerfile b/Dockerfile
index 281fd6ca2..88a7e6a79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.1.6-alpine3.20 as base
+FROM ruby:3.4.4-alpine3.20 as base
 
 WORKDIR /app
 
@@ -10,7 +10,7 @@ RUN apk add --update --no-cache tzdata && \
 # build-base: compilation tools for bundle
 # yarn: node package manager
 # postgresql-dev: postgres driver and libraries
-RUN apk add --no-cache build-base=0.5-r3 busybox=1.36.1-r29 nodejs=20.15.1-r0 yarn=1.22.22-r0 bash=5.2.26-r0 libpq-dev
+RUN apk add --no-cache build-base=0.5-r3 busybox=1.36.1-r29 nodejs=20.15.1-r0 yarn=1.22.22-r0 bash=5.2.26-r0 libpq-dev yaml-dev linux-headers
 
 # Bundler version should be the same version as what the Gemfile.lock was bundled with
 RUN gem install bundler:2.6.4 --no-document
diff --git a/Gemfile b/Gemfile
index f6e7fdac5..91ed6c8a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.1.6"
+ruby "3.4.4"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
 gem "rails", "~> 7.2.2"
@@ -51,7 +51,7 @@ gem "paper_trail-globalid"
 gem "pundit"
 
 # Request rate limiting
-gem "rack", ">= 2.2.6.3"
+gem "rack", "~> 3.1.20"
 gem "rack-attack"
 gem "redis", "~> 4.8"
 # Receive exceptions and configure alerts
@@ -72,9 +72,12 @@ gem "sidekiq-cron"
 gem "unread"
 
 # Pinning versions to address vulnerabilities
-gem "nokogiri", "~> 1.18.9"
+gem "nokogiri", "~> 1.19.1"
 gem "thor", "~> 1.4.0"
 
+# Pinning until activesupport is updated to v8.1.2
+gem "connection_pool", "~> 2.5"
+
 group :development, :test do
   # Check gems for known vulnerabilities
   gem "bundler-audit"
@@ -95,7 +98,7 @@ group :development do
   # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
   gem "erb_lint", require: false
   gem "rack-mini-profiler", "~> 3.3.0"
-  gem "rubocop-govuk", "4.3.0", require: false
+  gem "rubocop-govuk", "5.2.0", require: false
   gem "rubocop-performance", require: false
   gem "rubocop-rails", require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 34bfd3067..4277b9499 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    ast (2.4.2)
+    ast (2.4.3)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
     aws-eventstream (1.4.0)
@@ -113,15 +113,15 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.3.0)
     bcrypt (3.1.20)
-    benchmark (0.4.1)
-    better_html (2.0.2)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
+    benchmark (0.5.0)
+    better_html (2.2.0)
+      actionview (>= 7.0)
+      activesupport (>= 7.0)
       ast (~> 2.0)
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.2.2)
+    bigdecimal (4.0.1)
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
@@ -151,7 +151,7 @@ GEM
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
     connection_pool (2.5.3)
     crack (1.0.0)
       bigdecimal
@@ -184,12 +184,12 @@ GEM
     drb (2.2.3)
     dumb_delegator (1.0.0)
     encryptor (3.0.0)
-    erb_lint (0.5.0)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       rainbow
-      rubocop
+      rubocop (>= 1)
       smart_properties
     erubi (1.13.1)
     et-orbi (1.2.11)
@@ -232,7 +232,7 @@ GEM
     hashdiff (1.1.0)
     html-attributes-utils (1.0.2)
       activesupport (>= 6.1.4.4)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     iniparse (1.5.0)
@@ -261,13 +261,15 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
+    language_server-protocol (3.17.0.5)
     launchy (2.5.2)
       addressable (~> 2.8)
+    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.0)
+    loofah (2.25.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -279,7 +281,9 @@ GEM
     matrix (0.4.2)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.25.5)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
     msgpack (1.7.2)
     multipart-post (2.4.1)
     nested_form (0.3.2)
@@ -295,13 +299,13 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.9-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-darwin)
+    nokogiri (1.19.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-musl)
+    nokogiri (1.19.1-x86_64-linux-musl)
       racc (~> 1.4)
     notifications-ruby-client (6.0.0)
       jwt (>= 1.5, < 3)
@@ -317,10 +321,10 @@ GEM
     paper_trail-globalid (0.2.0)
       globalid
       paper_trail (>= 3.0.0)
-    parallel (1.24.0)
+    parallel (1.27.0)
     parallel_tests (4.5.1)
       parallel
-    parser (3.3.0.5)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     pg (1.5.5)
@@ -328,6 +332,7 @@ GEM
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
+    prism (1.9.0)
     propshaft (0.8.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
@@ -349,7 +354,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.18)
+    rack (3.1.20)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-mini-profiler (3.3.1)
@@ -375,7 +380,7 @@ GEM
       activesupport (= 7.2.2.2)
       bundler (>= 1.15.0)
       railties (= 7.2.2.2)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -409,7 +414,7 @@ GEM
     redis (4.8.1)
     redis-client (0.22.1)
       connection_pool
-    regexp_parser (2.9.0)
+    regexp_parser (2.11.3)
     reline (0.6.0)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -439,34 +444,45 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.13.1)
-    rubocop (1.25.0)
+    rubocop (1.82.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-govuk (4.3.0)
-      rubocop (= 1.25.0)
-      rubocop-ast (= 1.15.1)
-      rubocop-rails (= 2.13.2)
-      rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 2.7.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-govuk (5.2.0)
+      rubocop (= 1.82.1)
+      rubocop-ast (= 1.49.0)
+      rubocop-capybara (= 2.22.1)
+      rubocop-rails (= 2.34.3)
+      rubocop-rake (= 0.7.1)
+      rubocop-rspec (= 3.9.0)
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.13.2)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.7.0)
-      rubocop (~> 1.19)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.9.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
     ruby-openai (7.0.1)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
@@ -514,7 +530,9 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uk_postcode (2.1.8)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
     unread (0.14.0)
       activerecord (>= 6.1)
     uri (1.0.4)
@@ -563,6 +581,7 @@ DEPENDENCIES
   capybara
   capybara-lockstep
   capybara-screenshot
+  connection_pool (~> 2.5)
   cssbundling-rails
   devise
   devise_two_factor_authentication
@@ -579,7 +598,7 @@ DEPENDENCIES
   json-schema
   listen (~> 3.3)
   method_source (~> 1.1)
-  nokogiri (~> 1.18.9)
+  nokogiri (~> 1.19.1)
   notifications-ruby-client
   overcommit (>= 0.37.0)
   paper_trail (~> 15.2)
@@ -591,7 +610,7 @@ DEPENDENCIES
   pry-byebug
   puma (~> 6.4)
   pundit
-  rack (>= 2.2.6.3)
+  rack (~> 3.1.20)
   rack-attack
   rack-mini-profiler (~> 3.3.0)
   rails (~> 7.2.2)
@@ -600,7 +619,7 @@ DEPENDENCIES
   redis (~> 4.8)
   roo
   rspec-rails
-  rubocop-govuk (= 4.3.0)
+  rubocop-govuk (= 5.2.0)
   rubocop-performance
   rubocop-rails
   ruby-openai
@@ -621,7 +640,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.1.6p260
+   ruby 3.4.4p0
 
 BUNDLED WITH
    2.6.4
diff --git a/app/controllers/csv_downloads_controller.rb b/app/controllers/csv_downloads_controller.rb
index 25f70026f..e2a7fb4f1 100644
--- a/app/controllers/csv_downloads_controller.rb
+++ b/app/controllers/csv_downloads_controller.rb
@@ -5,7 +5,7 @@ class CsvDownloadsController < ApplicationController
     @csv_download = CsvDownload.find(params[:id])
     authorize @csv_download
 
-    return render "errors/download_link_expired" if @csv_download.expired?
+    render "errors/download_link_expired" if @csv_download.expired?
   end
 
   def download
diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb
index 38a89b682..cd2a6ca5a 100644
--- a/app/controllers/lettings_logs_controller.rb
+++ b/app/controllers/lettings_logs_controller.rb
@@ -190,7 +190,7 @@ private
   end
 
   def resolve_logs!
-    if @log&.unresolved && @log.location.present? && @log.scheme.present? && @log&.resolve!
+    if @log&.unresolved && @log.location.present? && @log.scheme.present? && @log.resolve!
       unresolved_logs_count_for_user = current_user.lettings_logs.unresolved.assigned_to(current_user).count
       flash.now[:notice] = helpers.flash_notice_for_resolved_logs(unresolved_logs_count_for_user)
     end
diff --git a/app/controllers/lettings_logs_filters_controller.rb b/app/controllers/lettings_logs_filters_controller.rb
index 9180737d3..c6ea0ba70 100644
--- a/app/controllers/lettings_logs_filters_controller.rb
+++ b/app/controllers/lettings_logs_filters_controller.rb
@@ -52,8 +52,6 @@ class LettingsLogsFiltersController < ApplicationController
   end
 end
 
-private
-
 def lettings_session_filters
   params["years"] = [params["years"]] if params["years"].present?
   lettings_filter_manager.session_filters
diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb
index 32f7b2d0c..f1878e9ab 100644
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -105,7 +105,7 @@ private
     answer_options = { "" => "Select an option" }
 
     if current_user.support?
-      Organisation.all.each do |organisation|
+      Organisation.all.find_each do |organisation|
         date = @merge_request.merge_date || Time.zone.today
         answer_options[organisation.id] = organisation.name(date:)
       end
diff --git a/app/controllers/sales_logs_filters_controller.rb b/app/controllers/sales_logs_filters_controller.rb
index ffa4f4bc4..70a4c2b49 100644
--- a/app/controllers/sales_logs_filters_controller.rb
+++ b/app/controllers/sales_logs_filters_controller.rb
@@ -53,8 +53,6 @@ class SalesLogsFiltersController < ApplicationController
   end
 end
 
-private
-
 def sales_session_filters
   params["years"] = [params["years"]] if params["years"].present?
   sales_filter_manager.session_filters
diff --git a/app/helpers/bulk_upload/lettings_log_to_csv.rb b/app/helpers/bulk_upload/lettings_log_to_csv.rb
index 799dbece6..11f60773f 100644
--- a/app/helpers/bulk_upload/lettings_log_to_csv.rb
+++ b/app/helpers/bulk_upload/lettings_log_to_csv.rb
@@ -2,12 +2,10 @@ class BulkUpload::LettingsLogToCsv
   attr_reader :log, :line_ending, :col_offset, :overrides
 
   def initialize(log:, line_ending: "\n", col_offset: 1, overrides: {})
-    # rubocop:disable Rails/HelperInstanceVariable
     @log = log
     @line_ending = line_ending
     @col_offset = col_offset
     @overrides = overrides
-    # rubocop:enable Rails/HelperInstanceVariable
   end
 
   def row_prefix
diff --git a/app/helpers/bulk_upload/sales_log_to_csv.rb b/app/helpers/bulk_upload/sales_log_to_csv.rb
index 1171f481f..30833c1c7 100644
--- a/app/helpers/bulk_upload/sales_log_to_csv.rb
+++ b/app/helpers/bulk_upload/sales_log_to_csv.rb
@@ -2,12 +2,10 @@ class BulkUpload::SalesLogToCsv
   attr_reader :log, :line_ending, :col_offset, :overrides
 
   def initialize(log:, line_ending: "\n", col_offset: 1, overrides: {})
-    # rubocop:disable Rails/HelperInstanceVariable
     @log = log
     @line_ending = line_ending
     @col_offset = col_offset
     @overrides = overrides
-    # rubocop:enable Rails/HelperInstanceVariable
   end
 
   def row_prefix
diff --git a/app/helpers/data_sharing_agreement_helper.rb b/app/helpers/data_sharing_agreement_helper.rb
index 79296e6dc..5ab5e3272 100644
--- a/app/helpers/data_sharing_agreement_helper.rb
+++ b/app/helpers/data_sharing_agreement_helper.rb
@@ -67,7 +67,7 @@ module DataSharingAgreementHelper
       "12.2. For #{@org_name}: Name: #{@dpo_name}, Postal Address: #{@org_address}, E-mail address: #{@dpo_email}, Telephone number: #{@org_phone}"
     end
   end
-# rubocop:enable Rails/HelperInstanceVariable
+  # rubocop:enable Rails/HelperInstanceVariable
 
 private
 
diff --git a/app/helpers/form_page_error_helper.rb b/app/helpers/form_page_error_helper.rb
index ded09d54c..c2ce87310 100644
--- a/app/helpers/form_page_error_helper.rb
+++ b/app/helpers/form_page_error_helper.rb
@@ -5,7 +5,7 @@ module FormPageErrorHelper
   end
 
   def remove_duplicate_page_errors(lettings_log)
-    lettings_log.errors.group_by(&:message).each do |_, errors|
+    lettings_log.errors.group_by(&:message).each_value do |errors|
       next if errors.size == 1
 
       errors.shift
diff --git a/app/helpers/locations_helper.rb b/app/helpers/locations_helper.rb
index 9ef74ca51..b8a111b0c 100644
--- a/app/helpers/locations_helper.rb
+++ b/app/helpers/locations_helper.rb
@@ -91,7 +91,8 @@ module LocationsHelper
 
   def toggle_location_link(location)
     return govuk_button_link_to "Deactivate this location", scheme_location_new_deactivation_path(location.scheme, location), warning: true if location.active? || location.deactivates_in_a_long_time?
-    return govuk_button_link_to "Reactivate this location", scheme_location_new_reactivation_path(location.scheme, location) if location.deactivated? && !location.deactivated_by_scheme?
+
+    govuk_button_link_to "Reactivate this location", scheme_location_new_reactivation_path(location.scheme, location) if location.deactivated? && !location.deactivated_by_scheme?
   end
 
   def delete_location_link(location)
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 3d9577ce9..6755b4646 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -101,13 +101,13 @@ module MergeRequestsHelper
     attribute = page if attribute.nil?
     return nil unless value_exists?(merge_request, attribute)
 
-    unless merge_request.status == "request_merged" || merge_request.status == "processing"
+    unless %w[request_merged processing].include?(merge_request.status)
       { text: merge_request_action_text(merge_request, attribute), href: send("#{page}_merge_request_path", merge_request, referrer: "check_answers"), visually_hidden_text: page.humanize }
     end
   end
 
   def merge_outcome_action(merge_request, page)
-    unless merge_request.status == "request_merged" || merge_request.status == "processing"
+    unless %w[request_merged processing].include?(merge_request.status)
       { text: "View", href: send("#{page}_merge_request_path", merge_request), visually_hidden_text: page.humanize }
     end
   end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 318918134..d3a369b45 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -57,7 +57,7 @@ class NotificationRenderer < Redcarpet::Render::HTML
   def initialize(options = {})
     link_class = "govuk-link"
     link_class += " govuk-link--inverse" if options[:invert_link_colour]
-    @bold = options[:bold_all_text] # rubocop:disable Rails/HelperInstanceVariable
+    @bold = options[:bold_all_text]
     base_options = { escape_html: true, safe_links_only: true, link_attributes: { class: link_class } }
     super base_options
   end
@@ -78,7 +78,7 @@ class NotificationRenderer < Redcarpet::Render::HTML
   end
 
   def paragraph(text)
-    return %(<p class="govuk-!-font-weight-bold">#{text}</p>) if @bold # rubocop:disable Rails/HelperInstanceVariable
+    return %(<p class="govuk-!-font-weight-bold">#{text}</p>) if @bold
 
     %(<p class="govuk-body-m">#{text}</p>)
   end
diff --git a/app/helpers/question_view_helper.rb b/app/helpers/question_view_helper.rb
index acb4fa959..0c4b6337f 100644
--- a/app/helpers/question_view_helper.rb
+++ b/app/helpers/question_view_helper.rb
@@ -44,7 +44,8 @@ module QuestionViewHelper
   def select_option_name(value)
     return value.service_name if value.respond_to?(:service_name)
     return value["name"] if value.is_a?(Hash) && value["name"].present?
-    return value["postcode"] if value.is_a?(Location)
+
+    value["postcode"] if value.is_a?(Location)
   end
 
 private
diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb
index 753f33917..e72250c6e 100644
--- a/app/helpers/schemes_helper.rb
+++ b/app/helpers/schemes_helper.rb
@@ -12,7 +12,8 @@ module SchemesHelper
 
   def toggle_scheme_link(scheme)
     return govuk_button_link_to "Deactivate this scheme", scheme_new_deactivation_path(scheme), warning: true if scheme.active? || scheme.deactivates_in_a_long_time?
-    return govuk_button_link_to "Reactivate this scheme", scheme_new_reactivation_path(scheme) if scheme.deactivated? || scheme.deactivating_soon?
+
+    govuk_button_link_to "Reactivate this scheme", scheme_new_reactivation_path(scheme) if scheme.deactivated? || scheme.deactivating_soon?
   end
 
   def delete_scheme_link(scheme)
diff --git a/app/mailers/devise_notify_mailer.rb b/app/mailers/devise_notify_mailer.rb
index 5ee3fd898..4065e3aa9 100644
--- a/app/mailers/devise_notify_mailer.rb
+++ b/app/mailers/devise_notify_mailer.rb
@@ -92,8 +92,7 @@ class DeviseNotifyMailer < Devise::Mailer
 
   def email_changed?(record)
     (
-      record.confirmable_template == User::CONFIRMABLE_TEMPLATE_ID && (
-        record.unconfirmed_email.present? && record.unconfirmed_email != record.email)
+      record.confirmable_template == User::CONFIRMABLE_TEMPLATE_ID && record.unconfirmed_email.present? && record.unconfirmed_email != record.email
     ) || (
       record.versions.last.changeset.key?("unconfirmed_email") &&
       record.confirmed?
diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb
index 19a58d916..6c88c3221 100644
--- a/app/models/derived_variables/lettings_log_variables.rb
+++ b/app/models/derived_variables/lettings_log_variables.rb
@@ -254,7 +254,7 @@ private
 
   def clear_inapplicable_derived_values!
     reset_invalidated_derived_values!(dependencies)
-    if (startdate_changed? || renewal_changed?) && (renewal_was == 1 && startdate_was&.between?(Time.zone.local(2021, 4, 1), Time.zone.local(2022, 3, 31)))
+    if (startdate_changed? || renewal_changed?) && renewal_was == 1 && startdate_was&.between?(Time.zone.local(2021, 4, 1), Time.zone.local(2022, 3, 31))
       self.underoccupation_benefitcap = nil
     end
     if renewal_changed? && renewal_was == 1
@@ -270,7 +270,7 @@ private
       self.wchair = nil
       self.location_id = nil
     end
-    if form.start_year_2024_or_later? && (unittype_gn_changed? && unittype_gn_was == 2)
+    if form.start_year_2024_or_later? && unittype_gn_changed? && unittype_gn_was == 2
       self.beds = nil
     end
   end
@@ -439,13 +439,15 @@ private
 
   def get_lar
     return 1 if rent_type == 2
-    return 2 if rent_type == 1
+
+    2 if rent_type == 1
   end
 
   def get_irproduct
     return 1 if rent_type == 3
     return 2 if rent_type == 4
-    return 3 if rent_type == 5
+
+    3 if rent_type == 5
   end
 
   def clear_gender_description_unless_gender_not_same_as_sex!
diff --git a/app/models/derived_variables/shared_logic.rb b/app/models/derived_variables/shared_logic.rb
index c326cb8c9..4b76d83d8 100644
--- a/app/models/derived_variables/shared_logic.rb
+++ b/app/models/derived_variables/shared_logic.rb
@@ -9,7 +9,7 @@ private
       previously_in_derived_state = dependency[:conditions].all? { |attribute, value| send("#{attribute}_was") == value }
       next unless previously_in_derived_state
 
-      dependency[:derived_values].each do |derived_attribute, _derived_value|
+      dependency[:derived_values].each_key do |derived_attribute|
         Rails.logger.debug("Cleared derived #{derived_attribute} value")
         send("#{derived_attribute}=", nil)
       end
diff --git a/app/models/form/lettings/pages/tenancyother_value_check.rb b/app/models/form/lettings/pages/tenancyother_value_check.rb
new file mode 100644
index 000000000..391b06eab
--- /dev/null
+++ b/app/models/form/lettings/pages/tenancyother_value_check.rb
@@ -0,0 +1,24 @@
+class Form::Lettings::Pages::TenancyotherValueCheck < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "tenancyother_value_check"
+    @copy_key = "lettings.soft_validations.tenancyother_value_check"
+    @depends_on = [{ "tenancyother_might_be_introductory_or_starter_period?" => true }]
+    @title_text = {
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
+      "arguments" => [{ "key" => "tenancyother", "i18n_template" => "tenancyother" }],
+    }
+    @informative_text = {
+      "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text",
+      "arguments" => [],
+    }
+  end
+
+  def questions
+    @questions ||= [Form::Lettings::Questions::TenancyotherValueCheck.new(nil, nil, self)]
+  end
+
+  def interruption_screen_question_ids
+    %w[startertenancy tenancy tenancyother]
+  end
+end
diff --git a/app/models/form/lettings/questions/address_line1.rb b/app/models/form/lettings/questions/address_line1.rb
index 4b1f67931..2f88b210e 100644
--- a/app/models/form/lettings/questions/address_line1.rb
+++ b/app/models/form/lettings/questions/address_line1.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::AddressLine1 < ::Form::Question
     @type = "text"
     @plain_label = true
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
   end
 
@@ -18,5 +18,5 @@ class Form::Lettings::Questions::AddressLine1 < ::Form::Question
     ].select(&:present?).join("\n")
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17, 2026 => 17 }.freeze
 end
diff --git a/app/models/form/lettings/questions/address_search.rb b/app/models/form/lettings/questions/address_search.rb
index c6abe9a6c..eb970a5e5 100644
--- a/app/models/form/lettings/questions/address_search.rb
+++ b/app/models/form/lettings/questions/address_search.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::AddressSearch < ::Form::Question
     @copy_key = "lettings.property_information.address_search"
     @plain_label = true
     @bottom_guidance_partial = "address_search"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
   end
 
@@ -38,5 +38,5 @@ class Form::Lettings::Questions::AddressSearch < ::Form::Question
     answer_options(log, user).transform_values { |value| value["value"] } || {}
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2024 => 12, 2025 => 16 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2024 => 12, 2025 => 16, 2026 => 16 }.freeze
 end
diff --git a/app/models/form/lettings/questions/age.rb b/app/models/form/lettings/questions/age.rb
index f35abe61e..61e70fe05 100644
--- a/app/models/form/lettings/questions/age.rb
+++ b/app/models/form/lettings/questions/age.rb
@@ -19,11 +19,17 @@ class Form::Lettings::Questions::Age < ::Form::Question
     base_question_number = case form.start_date.year
                            when 2023
                              31
-                           else
+                           when 2024
+                             30
+                           when 2025
                              30
+                           when 2026
+                             27
+                           else
+                             27
                            end
 
-    base_question_number + (4 * @person_index)
+    base_question_number + (form.person_question_count * @person_index)
   end
 
   def hint_text
diff --git a/app/models/form/lettings/questions/age1.rb b/app/models/form/lettings/questions/age1.rb
index 72d89096c..428fabd42 100644
--- a/app/models/form/lettings/questions/age1.rb
+++ b/app/models/form/lettings/questions/age1.rb
@@ -10,8 +10,8 @@ class Form::Lettings::Questions::Age1 < ::Form::Question
     @max = 120
     @min = 16
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 31 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 31, 2025 => 31, 2026 => 30 }.freeze
 end
diff --git a/app/models/form/lettings/questions/age1_known.rb b/app/models/form/lettings/questions/age1_known.rb
index e54d7993b..753fdd2cb 100644
--- a/app/models/form/lettings/questions/age1_known.rb
+++ b/app/models/form/lettings/questions/age1_known.rb
@@ -8,10 +8,10 @@ class Form::Lettings::Questions::Age1Known < ::Form::Question
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "age1" => [0] }
     @hidden_in_check_answers = { "depends_on" => [{ "age1_known" => 0 }, { "age1_known" => 1 }] }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 31 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 32, 2024 => 31, 2025 => 31, 2026 => 30 }.freeze
 end
diff --git a/app/models/form/lettings/questions/age_known.rb b/app/models/form/lettings/questions/age_known.rb
index 2f5d7ce0b..c4bb65c2e 100644
--- a/app/models/form/lettings/questions/age_known.rb
+++ b/app/models/form/lettings/questions/age_known.rb
@@ -23,10 +23,16 @@ class Form::Lettings::Questions::AgeKnown < ::Form::Question
     base_question_number = case form.start_date.year
                            when 2023
                              31
-                           else
+                           when 2024
+                             30
+                           when 2025
                              30
+                           when 2026
+                             27
+                           else
+                             27
                            end
 
-    base_question_number + (4 * @person_index)
+    base_question_number + (form.person_question_count * @person_index)
   end
 end
diff --git a/app/models/form/lettings/questions/armedforces.rb b/app/models/form/lettings/questions/armedforces.rb
index 9bfe4b643..32aac69ca 100644
--- a/app/models/form/lettings/questions/armedforces.rb
+++ b/app/models/form/lettings/questions/armedforces.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Armedforces < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -18,5 +18,5 @@ class Form::Lettings::Questions::Armedforces < ::Form::Question
     "6" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 66, 2024 => 65 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 66, 2024 => 65, 2025 => 65, 2026 => 72 }.freeze
 end
diff --git a/app/models/form/lettings/questions/beds.rb b/app/models/form/lettings/questions/beds.rb
index 1bafa3ddf..1e59c367c 100644
--- a/app/models/form/lettings/questions/beds.rb
+++ b/app/models/form/lettings/questions/beds.rb
@@ -7,12 +7,12 @@ class Form::Lettings::Questions::Beds < ::Form::Question
     @max = 12
     @min = 1
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def derived?(log)
     log.is_bedsit?
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 22 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 22, 2024 => 22, 2025 => 22, 2026 => 21 }.freeze
 end
diff --git a/app/models/form/lettings/questions/benefits.rb b/app/models/form/lettings/questions/benefits.rb
index f5f2a3ee1..4ab922215 100644
--- a/app/models/form/lettings/questions/benefits.rb
+++ b/app/models/form/lettings/questions/benefits.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Benefits < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -16,5 +16,5 @@ class Form::Lettings::Questions::Benefits < ::Form::Question
     "4" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 90, 2024 => 89 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 90, 2024 => 89, 2025 => 89, 2026 => 97 }.freeze
 end
diff --git a/app/models/form/lettings/questions/brent_4_weekly.rb b/app/models/form/lettings/questions/brent_4_weekly.rb
index 7087571fd..319b495a5 100644
--- a/app/models/form/lettings/questions/brent_4_weekly.rb
+++ b/app/models/form/lettings/questions/brent_4_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::Brent4Weekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every 4 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92, 2026 => 100 }.freeze
 end
diff --git a/app/models/form/lettings/questions/brent_bi_weekly.rb b/app/models/form/lettings/questions/brent_bi_weekly.rb
index 1a20fd61c..d33863756 100644
--- a/app/models/form/lettings/questions/brent_bi_weekly.rb
+++ b/app/models/form/lettings/questions/brent_bi_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::BrentBiWeekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every 2 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92, 2026 => 100 }.freeze
 end
diff --git a/app/models/form/lettings/questions/brent_monthly.rb b/app/models/form/lettings/questions/brent_monthly.rb
index 245bde158..8e71bb8ec 100644
--- a/app/models/form/lettings/questions/brent_monthly.rb
+++ b/app/models/form/lettings/questions/brent_monthly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::BrentMonthly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every month"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92, 2026 => 100 }.freeze
 end
diff --git a/app/models/form/lettings/questions/brent_weekly.rb b/app/models/form/lettings/questions/brent_weekly.rb
index c913816fc..706f94b3d 100644
--- a/app/models/form/lettings/questions/brent_weekly.rb
+++ b/app/models/form/lettings/questions/brent_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::BrentWeekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every week"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 95, 2024 => 94, 2025 => 92, 2026 => 100 }.freeze
 end
diff --git a/app/models/form/lettings/questions/builtype.rb b/app/models/form/lettings/questions/builtype.rb
index 8c34beca1..55f76536c 100644
--- a/app/models/form/lettings/questions/builtype.rb
+++ b/app/models/form/lettings/questions/builtype.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::Builtype < ::Form::Question
     @id = "builtype"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -12,5 +12,5 @@ class Form::Lettings::Questions::Builtype < ::Form::Question
     "1" => { "value" => "Purpose built" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 20 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 20, 2025 => 20 }.freeze
 end
diff --git a/app/models/form/lettings/questions/chcharge_4_weekly.rb b/app/models/form/lettings/questions/chcharge_4_weekly.rb
index 341010eb0..403ab3e75 100644
--- a/app/models/form/lettings/questions/chcharge_4_weekly.rb
+++ b/app/models/form/lettings/questions/chcharge_4_weekly.rb
@@ -9,9 +9,9 @@ class Form::Lettings::Questions::Chcharge4Weekly < ::Form::Question
     @step = 0.01
     @prefix = "£"
     @suffix = " every 4 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93, 2025 => 93, 2026 => 101 }.freeze
 end
diff --git a/app/models/form/lettings/questions/chcharge_bi_weekly.rb b/app/models/form/lettings/questions/chcharge_bi_weekly.rb
index 0343839ca..274b26d0d 100644
--- a/app/models/form/lettings/questions/chcharge_bi_weekly.rb
+++ b/app/models/form/lettings/questions/chcharge_bi_weekly.rb
@@ -9,9 +9,9 @@ class Form::Lettings::Questions::ChchargeBiWeekly < ::Form::Question
     @step = 0.01
     @prefix = "£"
     @suffix = " every 2 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93, 2025 => 93, 2026 => 101 }.freeze
 end
diff --git a/app/models/form/lettings/questions/chcharge_monthly.rb b/app/models/form/lettings/questions/chcharge_monthly.rb
index 9e68eb18f..967295d45 100644
--- a/app/models/form/lettings/questions/chcharge_monthly.rb
+++ b/app/models/form/lettings/questions/chcharge_monthly.rb
@@ -9,9 +9,9 @@ class Form::Lettings::Questions::ChchargeMonthly < ::Form::Question
     @step = 0.01
     @prefix = "£"
     @suffix = " every month"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93, 2025 => 93, 2026 => 101 }.freeze
 end
diff --git a/app/models/form/lettings/questions/chcharge_weekly.rb b/app/models/form/lettings/questions/chcharge_weekly.rb
index 3c8b995eb..d27d586b4 100644
--- a/app/models/form/lettings/questions/chcharge_weekly.rb
+++ b/app/models/form/lettings/questions/chcharge_weekly.rb
@@ -9,9 +9,9 @@ class Form::Lettings::Questions::ChchargeWeekly < ::Form::Question
     @step = 0.01
     @prefix = "£"
     @suffix = " every week"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 94, 2024 => 93, 2025 => 93, 2026 => 101 }.freeze
 end
diff --git a/app/models/form/lettings/questions/condition_effects.rb b/app/models/form/lettings/questions/condition_effects.rb
index 1821f6e98..af967d17e 100644
--- a/app/models/form/lettings/questions/condition_effects.rb
+++ b/app/models/form/lettings/questions/condition_effects.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::ConditionEffects < ::Form::Question
     @type = "checkbox"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -27,5 +27,5 @@ class Form::Lettings::Questions::ConditionEffects < ::Form::Question
     "illness_type_10" => { "value" => "Other" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 74, 2024 => 73 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 74, 2024 => 73, 2025 => 73, 2026 => 80 }.freeze
 end
diff --git a/app/models/form/lettings/questions/county.rb b/app/models/form/lettings/questions/county.rb
index 12585fa8e..b634fd6dc 100644
--- a/app/models/form/lettings/questions/county.rb
+++ b/app/models/form/lettings/questions/county.rb
@@ -6,9 +6,9 @@ class Form::Lettings::Questions::County < ::Form::Question
     @type = "text"
     @plain_label = true
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17, 2026 => 17 }.freeze
 end
diff --git a/app/models/form/lettings/questions/declaration.rb b/app/models/form/lettings/questions/declaration.rb
index 3261452cd..6a2572487 100644
--- a/app/models/form/lettings/questions/declaration.rb
+++ b/app/models/form/lettings/questions/declaration.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Declaration < ::Form::Question
     @type = "checkbox"
     @check_answers_card_number = 0 unless form.start_year_2024_or_later?
     @top_guidance_partial = "privacy_notice_tenant"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -26,5 +26,5 @@ class Form::Lettings::Questions::Declaration < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 30, 2024 => 11 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 30, 2024 => 11, 2025 => 11, 2026 => 11 }.freeze
 end
diff --git a/app/models/form/lettings/questions/earnings.rb b/app/models/form/lettings/questions/earnings.rb
index 4d3437052..13482135e 100644
--- a/app/models/form/lettings/questions/earnings.rb
+++ b/app/models/form/lettings/questions/earnings.rb
@@ -15,9 +15,9 @@ class Form::Lettings::Questions::Earnings < ::Form::Question
       { "label" => " every month", "depends_on" => { "incfreq" => 2 } },
       { "label" => " every year", "depends_on" => { "incfreq" => 3 } },
     ]
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 88, 2024 => 87 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 88, 2024 => 87, 2025 => 87, 2026 => 95 }.freeze
 end
diff --git a/app/models/form/lettings/questions/ethnic_arab.rb b/app/models/form/lettings/questions/ethnic_arab.rb
index d642c1a1b..582d92704 100644
--- a/app/models/form/lettings/questions/ethnic_arab.rb
+++ b/app/models/form/lettings/questions/ethnic_arab.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::EthnicArab < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -18,5 +18,5 @@ class Form::Lettings::Questions::EthnicArab < ::Form::Question
     },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
 end
diff --git a/app/models/form/lettings/questions/ethnic_asian.rb b/app/models/form/lettings/questions/ethnic_asian.rb
index 7fb309bba..f488249a6 100644
--- a/app/models/form/lettings/questions/ethnic_asian.rb
+++ b/app/models/form/lettings/questions/ethnic_asian.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::EthnicAsian < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -27,5 +27,5 @@ class Form::Lettings::Questions::EthnicAsian < ::Form::Question
     },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
 end
diff --git a/app/models/form/lettings/questions/ethnic_black.rb b/app/models/form/lettings/questions/ethnic_black.rb
index e3a88259e..f6902eb35 100644
--- a/app/models/form/lettings/questions/ethnic_black.rb
+++ b/app/models/form/lettings/questions/ethnic_black.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::EthnicBlack < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -21,5 +21,5 @@ class Form::Lettings::Questions::EthnicBlack < ::Form::Question
     },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
 end
diff --git a/app/models/form/lettings/questions/ethnic_group.rb b/app/models/form/lettings/questions/ethnic_group.rb
index 16bdfc4ba..c1c0be096 100644
--- a/app/models/form/lettings/questions/ethnic_group.rb
+++ b/app/models/form/lettings/questions/ethnic_group.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::EthnicGroup < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -18,5 +18,5 @@ class Form::Lettings::Questions::EthnicGroup < ::Form::Question
     "17" => { "value" => "Tenant prefers not to say" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 34, 2024 => 33 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 34, 2024 => 33, 2025 => 33, 2026 => 33 }.freeze
 end
diff --git a/app/models/form/lettings/questions/ethnic_mixed.rb b/app/models/form/lettings/questions/ethnic_mixed.rb
index 14d1f213b..f12f997b6 100644
--- a/app/models/form/lettings/questions/ethnic_mixed.rb
+++ b/app/models/form/lettings/questions/ethnic_mixed.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::EthnicMixed < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -24,5 +24,5 @@ class Form::Lettings::Questions::EthnicMixed < ::Form::Question
     },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
 end
diff --git a/app/models/form/lettings/questions/ethnic_white.rb b/app/models/form/lettings/questions/ethnic_white.rb
index 74430d840..98ebe78f3 100644
--- a/app/models/form/lettings/questions/ethnic_white.rb
+++ b/app/models/form/lettings/questions/ethnic_white.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::EthnicWhite < ::Form::Question
     @copy_key = "lettings.household_characteristics.ethnic.ethnic_background_white"
     @type = "radio"
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -27,5 +27,5 @@ class Form::Lettings::Questions::EthnicWhite < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 34, 2025 => 34, 2026 => 34 }.freeze
 end
diff --git a/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb b/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
index 09e6ece30..c9fb77abf 100644
--- a/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
+++ b/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
@@ -3,7 +3,7 @@ class Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing < ::Form::Q
     super
     @id = "first_time_property_let_as_social_housing"
     @type = "radio"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -21,5 +21,5 @@ class Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing < ::Form::Q
     form.start_year_2024_or_later? ? "This is a re-let of existing social housing stock." : "This is a re-let of existing social housing."
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 14, 2024 => 15, 2025 => 12 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 14, 2024 => 15, 2025 => 12, 2026 => 12 }.freeze
 end
diff --git a/app/models/form/lettings/questions/gender_identity1.rb b/app/models/form/lettings/questions/gender_identity1.rb
index 411bcd3d0..f3d86fde0 100644
--- a/app/models/form/lettings/questions/gender_identity1.rb
+++ b/app/models/form/lettings/questions/gender_identity1.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -16,5 +16,5 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
     "R" => { "value" => "Tenant prefers not to say" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 32 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 33, 2024 => 32, 2025 => 32 }.freeze
 end
diff --git a/app/models/form/lettings/questions/hb.rb b/app/models/form/lettings/questions/hb.rb
index 51da058b8..f9204e65a 100644
--- a/app/models/form/lettings/questions/hb.rb
+++ b/app/models/form/lettings/questions/hb.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Hb < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -17,5 +17,5 @@ class Form::Lettings::Questions::Hb < ::Form::Question
     "3" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 89, 2024 => 88 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 89, 2024 => 88, 2025 => 88, 2026 => 96 }.freeze
 end
diff --git a/app/models/form/lettings/questions/hbrentshortfall.rb b/app/models/form/lettings/questions/hbrentshortfall.rb
index 294423815..dfc323c3a 100644
--- a/app/models/form/lettings/questions/hbrentshortfall.rb
+++ b/app/models/form/lettings/questions/hbrentshortfall.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Hbrentshortfall < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -15,5 +15,5 @@ class Form::Lettings::Questions::Hbrentshortfall < ::Form::Question
     "3" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 99, 2024 => 98, 2025 => 96 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 99, 2024 => 98, 2025 => 96, 2026 => 104 }.freeze
 end
diff --git a/app/models/form/lettings/questions/hhmemb.rb b/app/models/form/lettings/questions/hhmemb.rb
index 88328a869..614b2b27e 100644
--- a/app/models/form/lettings/questions/hhmemb.rb
+++ b/app/models/form/lettings/questions/hhmemb.rb
@@ -8,9 +8,9 @@ class Form::Lettings::Questions::Hhmemb < ::Form::Question
     @max = 8
     @min = 1
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @check_answers_card_title = "Household" if form.start_year_2026_or_later?
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 30 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 31, 2024 => 30, 2025 => 30, 2026 => 29 }.freeze
 end
diff --git a/app/models/form/lettings/questions/homeless.rb b/app/models/form/lettings/questions/homeless.rb
index 1194fa929..44e03f937 100644
--- a/app/models/form/lettings/questions/homeless.rb
+++ b/app/models/form/lettings/questions/homeless.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Homeless < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -13,5 +13,5 @@ class Form::Lettings::Questions::Homeless < ::Form::Question
     "1" => { "value" => "No" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 79, 2024 => 78 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 79, 2024 => 78, 2025 => 78, 2026 => 85 }.freeze
 end
diff --git a/app/models/form/lettings/questions/household_charge.rb b/app/models/form/lettings/questions/household_charge.rb
index 60fee977d..32bdee4a6 100644
--- a/app/models/form/lettings/questions/household_charge.rb
+++ b/app/models/form/lettings/questions/household_charge.rb
@@ -5,10 +5,10 @@ class Form::Lettings::Questions::HouseholdCharge < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 91, 2024 => 90 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 91, 2024 => 90, 2025 => 90, 2026 => 98 }.freeze
 end
diff --git a/app/models/form/lettings/questions/housingneeds.rb b/app/models/form/lettings/questions/housingneeds.rb
index 03c80d5cb..29f0b5882 100644
--- a/app/models/form/lettings/questions/housingneeds.rb
+++ b/app/models/form/lettings/questions/housingneeds.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Housingneeds < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -15,5 +15,5 @@ class Form::Lettings::Questions::Housingneeds < ::Form::Question
     "3" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 70, 2024 => 69 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 70, 2024 => 69, 2025 => 69, 2026 => 76 }.freeze
 end
diff --git a/app/models/form/lettings/questions/housingneeds_other.rb b/app/models/form/lettings/questions/housingneeds_other.rb
index d99812535..d8915e936 100644
--- a/app/models/form/lettings/questions/housingneeds_other.rb
+++ b/app/models/form/lettings/questions/housingneeds_other.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::HousingneedsOther < ::Form::Question
     @copy_key = "lettings.household_needs.housingneeds_type.housingneeds_other"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -24,5 +24,5 @@ class Form::Lettings::Questions::HousingneedsOther < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 71 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 72, 2024 => 71, 2025 => 71, 2026 => 78 }.freeze
 end
diff --git a/app/models/form/lettings/questions/housingneeds_type.rb b/app/models/form/lettings/questions/housingneeds_type.rb
index 50b9c3742..15b5782d5 100644
--- a/app/models/form/lettings/questions/housingneeds_type.rb
+++ b/app/models/form/lettings/questions/housingneeds_type.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::HousingneedsType < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -17,5 +17,5 @@ class Form::Lettings::Questions::HousingneedsType < ::Form::Question
     "3" => { "value" => "None of the listed options" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 71, 2024 => 70 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 71, 2024 => 70, 2025 => 70, 2026 => 77 }.freeze
 end
diff --git a/app/models/form/lettings/questions/illness.rb b/app/models/form/lettings/questions/illness.rb
index f92a7a04a..4bc3667fb 100644
--- a/app/models/form/lettings/questions/illness.rb
+++ b/app/models/form/lettings/questions/illness.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Illness < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -15,5 +15,5 @@ class Form::Lettings::Questions::Illness < ::Form::Question
     "3" => { "value" => "Tenant prefers not to say" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 73, 2024 => 72 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 73, 2024 => 72, 2025 => 72, 2026 => 79 }.freeze
 end
diff --git a/app/models/form/lettings/questions/incfreq.rb b/app/models/form/lettings/questions/incfreq.rb
index d4384218e..74e24f439 100644
--- a/app/models/form/lettings/questions/incfreq.rb
+++ b/app/models/form/lettings/questions/incfreq.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::Incfreq < ::Form::Question
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
     @hidden_in_check_answers = true
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -16,5 +16,5 @@ class Form::Lettings::Questions::Incfreq < ::Form::Question
     "3" => { "value" => "Yearly" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 86 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 86, 2025 => 86, 2026 => 94 }.freeze
 end
diff --git a/app/models/form/lettings/questions/irproduct_other.rb b/app/models/form/lettings/questions/irproduct_other.rb
index b004d5dc2..993fcbf54 100644
--- a/app/models/form/lettings/questions/irproduct_other.rb
+++ b/app/models/form/lettings/questions/irproduct_other.rb
@@ -4,8 +4,8 @@ class Form::Lettings::Questions::IrproductOther < ::Form::Question
     @id = "irproduct_other"
     @copy_key = "lettings.setup.rent_type.irproduct_other"
     @type = "text"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 6, 2024 => 8 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 6, 2024 => 8, 2025 => 8, 2026 => 8 }.freeze
 end
diff --git a/app/models/form/lettings/questions/is_carehome.rb b/app/models/form/lettings/questions/is_carehome.rb
index 25dae3fc6..ea2df6eac 100644
--- a/app/models/form/lettings/questions/is_carehome.rb
+++ b/app/models/form/lettings/questions/is_carehome.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::IsCarehome < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @conditional_for = { "chcharge" => [1] }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -23,5 +23,5 @@ class Form::Lettings::Questions::IsCarehome < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 93, 2024 => 92 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 93, 2024 => 92, 2025 => 92, 2026 => 100 }.freeze
 end
diff --git a/app/models/form/lettings/questions/joint.rb b/app/models/form/lettings/questions/joint.rb
index 2542cd1c7..11f6749a6 100644
--- a/app/models/form/lettings/questions/joint.rb
+++ b/app/models/form/lettings/questions/joint.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Joint < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -15,5 +15,5 @@ class Form::Lettings::Questions::Joint < ::Form::Question
     "3" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 25, 2024 => 25, 2025 => 26 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 25, 2024 => 25, 2025 => 26, 2026 => 25 }.freeze
 end
diff --git a/app/models/form/lettings/questions/la.rb b/app/models/form/lettings/questions/la.rb
index c6d6f8240..d4d6954d2 100644
--- a/app/models/form/lettings/questions/la.rb
+++ b/app/models/form/lettings/questions/la.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::La < ::Form::Question
     @type = "select"
     @check_answers_card_number = nil
     @hint_text = ""
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
@@ -13,5 +13,5 @@ class Form::Lettings::Questions::La < ::Form::Question
     { "" => "Select an option" }.merge(LocalAuthority.active(form.start_date).england.map { |la| [la.code, la.name] }.to_h)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 13, 2024 => 14, 2025 => 18 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 13, 2024 => 14, 2025 => 18, 2026 => 18 }.freeze
 end
diff --git a/app/models/form/lettings/questions/layear.rb b/app/models/form/lettings/questions/layear.rb
index fdaad6c22..d8fa0a3a8 100644
--- a/app/models/form/lettings/questions/layear.rb
+++ b/app/models/form/lettings/questions/layear.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::Layear < ::Form::Question
     @id = "layear"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -36,5 +36,5 @@ class Form::Lettings::Questions::Layear < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 75, 2024 => 74 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 75, 2024 => 74, 2025 => 74, 2026 => 81 }.freeze
 end
diff --git a/app/models/form/lettings/questions/leftreg.rb b/app/models/form/lettings/questions/leftreg.rb
index 9b90566cf..3e81b52c0 100644
--- a/app/models/form/lettings/questions/leftreg.rb
+++ b/app/models/form/lettings/questions/leftreg.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Leftreg < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -16,5 +16,5 @@ class Form::Lettings::Questions::Leftreg < ::Form::Question
     "3" => { "value" => "Person prefers not to say" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 66 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 67, 2024 => 66, 2025 => 66, 2026 => 73 }.freeze
 end
diff --git a/app/models/form/lettings/questions/letting_allocation.rb b/app/models/form/lettings/questions/letting_allocation.rb
index 08310da13..2029335c4 100644
--- a/app/models/form/lettings/questions/letting_allocation.rb
+++ b/app/models/form/lettings/questions/letting_allocation.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::LettingAllocation < ::Form::Question
     @id = "letting_allocation"
     @type = "checkbox"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -28,5 +28,5 @@ class Form::Lettings::Questions::LettingAllocation < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 84, 2024 => 83 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 84, 2024 => 83, 2025 => 83, 2026 => 90 }.freeze
 end
diff --git a/app/models/form/lettings/questions/location_id.rb b/app/models/form/lettings/questions/location_id.rb
index 5bc316476..80e34aac0 100644
--- a/app/models/form/lettings/questions/location_id.rb
+++ b/app/models/form/lettings/questions/location_id.rb
@@ -10,7 +10,7 @@ class Form::Lettings::Questions::LocationId < ::Form::Question
         "needstype": 2,
       },
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
     @top_guidance_partial = "finding_location"
   end
@@ -55,5 +55,5 @@ private
     false
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 5 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 5, 2025 => 5, 2026 => 5 }.freeze
 end
diff --git a/app/models/form/lettings/questions/location_id_search.rb b/app/models/form/lettings/questions/location_id_search.rb
index 5e1734b51..e64125fda 100644
--- a/app/models/form/lettings/questions/location_id_search.rb
+++ b/app/models/form/lettings/questions/location_id_search.rb
@@ -10,7 +10,7 @@ class Form::Lettings::Questions::LocationIdSearch < ::Form::Question
         "needstype": 2,
       },
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
     @top_guidance_partial = "finding_location"
   end
@@ -50,5 +50,5 @@ private
     false
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 5 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 10, 2024 => 5, 2025 => 5, 2026 => 5 }.freeze
 end
diff --git a/app/models/form/lettings/questions/majorrepairs.rb b/app/models/form/lettings/questions/majorrepairs.rb
index a0c8a3a5c..b9b740cb1 100644
--- a/app/models/form/lettings/questions/majorrepairs.rb
+++ b/app/models/form/lettings/questions/majorrepairs.rb
@@ -6,10 +6,10 @@ class Form::Lettings::Questions::Majorrepairs < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "mrcdate" => [1] }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "0" => { "value" => "No" } }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 24 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 24, 2024 => 24, 2025 => 24, 2026 => 23 }.freeze
 end
diff --git a/app/models/form/lettings/questions/managing_organisation.rb b/app/models/form/lettings/questions/managing_organisation.rb
index 9c766ebe0..bf1b23c54 100644
--- a/app/models/form/lettings/questions/managing_organisation.rb
+++ b/app/models/form/lettings/questions/managing_organisation.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question
     @id = "managing_organisation_id"
     @derived = true
     @type = "select"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
   end
 
   def answer_options(log = nil, user = nil)
@@ -83,5 +83,5 @@ private
     true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 2 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 2, 2024 => 2, 2025 => 2, 2026 => 2 }.freeze
 end
diff --git a/app/models/form/lettings/questions/mrcdate.rb b/app/models/form/lettings/questions/mrcdate.rb
index 0c311d186..33c511887 100644
--- a/app/models/form/lettings/questions/mrcdate.rb
+++ b/app/models/form/lettings/questions/mrcdate.rb
@@ -4,8 +4,8 @@ class Form::Lettings::Questions::Mrcdate < ::Form::Question
     @id = "mrcdate"
     @copy_key = "lettings.property_information.property_major_repairs.mrcdate"
     @type = "date"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 24 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 24, 2024 => 24, 2025 => 24, 2026 => 23 }.freeze
 end
diff --git a/app/models/form/lettings/questions/nationality.rb b/app/models/form/lettings/questions/nationality.rb
index 8c4a700c1..a966f68f7 100644
--- a/app/models/form/lettings/questions/nationality.rb
+++ b/app/models/form/lettings/questions/nationality.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Nationality < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -19,5 +19,5 @@ class Form::Lettings::Questions::Nationality < ::Form::Question
     "13" => { "value" => "Tenant prefers not to say" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 34 }.freeze
 end
diff --git a/app/models/form/lettings/questions/nationality_all.rb b/app/models/form/lettings/questions/nationality_all.rb
index a4bb750a1..368c0ffb5 100644
--- a/app/models/form/lettings/questions/nationality_all.rb
+++ b/app/models/form/lettings/questions/nationality_all.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
     @type = "select"
     @check_answers_card_number = 1
     @answer_options = GlobalConstants::COUNTRIES_ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_label(log, _current_user = nil)
@@ -17,7 +17,7 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
     @answer_options.reject { |key, _| key == "826" }
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 35 }.freeze
 
   def label_from_value(value)
     return unless value
diff --git a/app/models/form/lettings/questions/nationality_all_group.rb b/app/models/form/lettings/questions/nationality_all_group.rb
index 559b1c9a0..0c4ed5d90 100644
--- a/app/models/form/lettings/questions/nationality_all_group.rb
+++ b/app/models/form/lettings/questions/nationality_all_group.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::NationalityAllGroup < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @conditional_for = { "nationality_all" => [12] }
     @hidden_in_check_answers = { "depends_on" => [{ "nationality_all_group" => 12 }] }
   end
@@ -17,5 +17,5 @@ class Form::Lettings::Questions::NationalityAllGroup < ::Form::Question
     "0" => { "value" => "Tenant prefers not to say" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35, 2025 => 35, 2026 => 35 }.freeze
 end
diff --git a/app/models/form/lettings/questions/needs_type.rb b/app/models/form/lettings/questions/needs_type.rb
index 9c32e30f9..87f331c07 100644
--- a/app/models/form/lettings/questions/needs_type.rb
+++ b/app/models/form/lettings/questions/needs_type.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::NeedsType < ::Form::Question
     @id = "needstype"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
     @top_guidance_partial = "needs_type" if form.start_year_2026_or_later?
   end
 
@@ -13,5 +13,5 @@ class Form::Lettings::Questions::NeedsType < ::Form::Question
     "2" => { "value" => "Supported housing" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 3 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 3, 2024 => 3, 2025 => 3, 2026 => 3 }.freeze
 end
diff --git a/app/models/form/lettings/questions/net_income_known.rb b/app/models/form/lettings/questions/net_income_known.rb
index 01c3bcaa3..4bcbe7fd1 100644
--- a/app/models/form/lettings/questions/net_income_known.rb
+++ b/app/models/form/lettings/questions/net_income_known.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::NetIncomeKnown < ::Form::Question
     @check_answers_card_number = 0
     @top_guidance_partial = "what_counts_as_income"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -16,5 +16,5 @@ class Form::Lettings::Questions::NetIncomeKnown < ::Form::Question
     "2" => { "value" => "Tenant prefers not to say" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 85 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 85, 2025 => 85, 2026 => 93 }.freeze
 end
diff --git a/app/models/form/lettings/questions/offered.rb b/app/models/form/lettings/questions/offered.rb
index c1aae8d32..38eccb40d 100644
--- a/app/models/form/lettings/questions/offered.rb
+++ b/app/models/form/lettings/questions/offered.rb
@@ -8,8 +8,8 @@ class Form::Lettings::Questions::Offered < ::Form::Question
     @max = 150
     @min = 0
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 18 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 18, 2024 => 18, 2025 => 18, 2026 => 18 }.freeze
 end
diff --git a/app/models/form/lettings/questions/period.rb b/app/models/form/lettings/questions/period.rb
index 6f98bd2a8..a0fb51d9f 100644
--- a/app/models/form/lettings/questions/period.rb
+++ b/app/models/form/lettings/questions/period.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Period < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -22,7 +22,7 @@ class Form::Lettings::Questions::Period < ::Form::Question
     "10" => { "value" => "Weekly for 53 weeks" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 92, 2024 => 91 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 92, 2024 => 91, 2025 => 91, 2026 => 99 }.freeze
 
   def displayed_answer_options(log, _user)
     return ANSWER_OPTIONS if log.managing_organisation.nil?
diff --git a/app/models/form/lettings/questions/person_partner.rb b/app/models/form/lettings/questions/person_partner.rb
index 98a22a448..c7b673131 100644
--- a/app/models/form/lettings/questions/person_partner.rb
+++ b/app/models/form/lettings/questions/person_partner.rb
@@ -21,11 +21,17 @@ class Form::Lettings::Questions::PersonPartner < ::Form::Question
     base_question_number = case form.start_date.year
                            when 2023
                              30
-                           else
+                           when 2024
+                             29
+                           when 2025
                              29
+                           when 2026
+                             28
+                           else
+                             28
                            end
 
-    base_question_number + (4 * @person_index)
+    base_question_number + (form.person_question_count * @person_index)
   end
 
   def derived?(log)
diff --git a/app/models/form/lettings/questions/person_sex_registered_at_birth.rb b/app/models/form/lettings/questions/person_sex_registered_at_birth.rb
index e5c54058f..819cc2df1 100644
--- a/app/models/form/lettings/questions/person_sex_registered_at_birth.rb
+++ b/app/models/form/lettings/questions/person_sex_registered_at_birth.rb
@@ -18,7 +18,7 @@ class Form::Lettings::Questions::PersonSexRegisteredAtBirth < ::Form::Question
   def question_number
     base_question_number = 29
 
-    base_question_number + (5 * @person_index)
+    base_question_number + (form.person_question_count * @person_index)
   end
 
   def label_from_value(value, _log = nil, _user = nil)
diff --git a/app/models/form/lettings/questions/person_working_situation.rb b/app/models/form/lettings/questions/person_working_situation.rb
index 74e11d030..0089416fb 100644
--- a/app/models/form/lettings/questions/person_working_situation.rb
+++ b/app/models/form/lettings/questions/person_working_situation.rb
@@ -57,10 +57,16 @@ class Form::Lettings::Questions::PersonWorkingSituation < ::Form::Question
     base_question_number = case form.start_date.year
                            when 2023
                              33
-                           else
+                           when 2024
+                             32
+                           when 2025
                              32
+                           when 2026
+                             31
+                           else
+                             31
                            end
 
-    base_question_number + (4 * @person_index)
+    base_question_number + (form.person_question_count * @person_index)
   end
 end
diff --git a/app/models/form/lettings/questions/postcode_for_full_address.rb b/app/models/form/lettings/questions/postcode_for_full_address.rb
index 114cf0db5..84c93f7d7 100644
--- a/app/models/form/lettings/questions/postcode_for_full_address.rb
+++ b/app/models/form/lettings/questions/postcode_for_full_address.rb
@@ -18,10 +18,10 @@ class Form::Lettings::Questions::PostcodeForFullAddress < ::Form::Question
     }
     @plain_label = true
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
     @bottom_guidance_partial = "address_fallback"
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17, 2026 => 17 }.freeze
 end
diff --git a/app/models/form/lettings/questions/ppcodenk.rb b/app/models/form/lettings/questions/ppcodenk.rb
index 5eec607eb..7cf7c63c2 100644
--- a/app/models/form/lettings/questions/ppcodenk.rb
+++ b/app/models/form/lettings/questions/ppcodenk.rb
@@ -8,7 +8,7 @@ class Form::Lettings::Questions::Ppcodenk < ::Form::Question
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "ppostcode_full" => [0] }
     @hidden_in_check_answers = { "depends_on" => [{ "ppcodenk" => 0 }, { "ppcodenk" => 1 }] }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
@@ -17,5 +17,5 @@ class Form::Lettings::Questions::Ppcodenk < ::Form::Question
     "1" => { "value" => "No" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 79 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 79, 2025 => 79, 2026 => 86 }.freeze
 end
diff --git a/app/models/form/lettings/questions/ppostcode_full.rb b/app/models/form/lettings/questions/ppostcode_full.rb
index 804576ca1..41feded8f 100644
--- a/app/models/form/lettings/questions/ppostcode_full.rb
+++ b/app/models/form/lettings/questions/ppostcode_full.rb
@@ -13,9 +13,9 @@ class Form::Lettings::Questions::PpostcodeFull < ::Form::Question
     }]
     @check_answers_card_number = 0
     @inferred_answers = { "prevloc" => { "is_previous_la_inferred" => true } }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 79 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 80, 2024 => 79, 2025 => 79, 2026 => 86 }.freeze
 end
diff --git a/app/models/form/lettings/questions/preg_occ.rb b/app/models/form/lettings/questions/preg_occ.rb
index 1ad1bd1f5..03bae1c04 100644
--- a/app/models/form/lettings/questions/preg_occ.rb
+++ b/app/models/form/lettings/questions/preg_occ.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::PregOcc < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -15,5 +15,5 @@ class Form::Lettings::Questions::PregOcc < ::Form::Question
     "3" => { "value" => "Tenant prefers not to say" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 68 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 69, 2024 => 68, 2025 => 68, 2026 => 75 }.freeze
 end
diff --git a/app/models/form/lettings/questions/previous_la_known.rb b/app/models/form/lettings/questions/previous_la_known.rb
index 2145e9d1f..b8721ff46 100644
--- a/app/models/form/lettings/questions/previous_la_known.rb
+++ b/app/models/form/lettings/questions/previous_la_known.rb
@@ -8,11 +8,11 @@ class Form::Lettings::Questions::PreviousLaKnown < ::Form::Question
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "prevloc" => [1] }
     @hidden_in_check_answers = { "depends_on" => [{ "previous_la_known" => 0 }, { "previous_la_known" => 1 }] }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
   ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "0" => { "value" => "No" } }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 81, 2024 => 80 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 81, 2024 => 80, 2025 => 80, 2026 => 87 }.freeze
 end
diff --git a/app/models/form/lettings/questions/previous_let_type.rb b/app/models/form/lettings/questions/previous_let_type.rb
index 8c35df84c..660e42869 100644
--- a/app/models/form/lettings/questions/previous_let_type.rb
+++ b/app/models/form/lettings/questions/previous_let_type.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::PreviousLetType < ::Form::Question
     @id = "unitletas"
     @type = "radio"
     @answer_options = answer_options
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -41,7 +41,7 @@ class Form::Lettings::Questions::PreviousLetType < ::Form::Question
     "3" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 17, 2025 => 14 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 17, 2025 => 14, 2026 => 14 }.freeze
 
   def answer_options
     return ANSWER_OPTIONS_AFTER_2025 if form.start_year_2025_or_later?
diff --git a/app/models/form/lettings/questions/previous_tenure.rb b/app/models/form/lettings/questions/previous_tenure.rb
index 47647b03c..65a3911b2 100644
--- a/app/models/form/lettings/questions/previous_tenure.rb
+++ b/app/models/form/lettings/questions/previous_tenure.rb
@@ -12,7 +12,7 @@ class Form::Lettings::Questions::PreviousTenure < ::Form::Question
                       else
                         ANSWER_OPTIONS
                       end
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -103,5 +103,5 @@ class Form::Lettings::Questions::PreviousTenure < ::Form::Question
     "25" => { "value" => "Any other accommodation" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 77 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 77, 2025 => 77, 2026 => 84 }.freeze
 end
diff --git a/app/models/form/lettings/questions/previous_tenure_renewal.rb b/app/models/form/lettings/questions/previous_tenure_renewal.rb
index e932fd218..20f0900bb 100644
--- a/app/models/form/lettings/questions/previous_tenure_renewal.rb
+++ b/app/models/form/lettings/questions/previous_tenure_renewal.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::PreviousTenureRenewal < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options =  form.start_year_2025_or_later? ? ANSWER_OPTIONS_2025 : ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -22,5 +22,5 @@ class Form::Lettings::Questions::PreviousTenureRenewal < ::Form::Question
     "6" => { "value" => "Other supported housing" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 77 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 77, 2025 => 77, 2026 => 84 }.freeze
 end
diff --git a/app/models/form/lettings/questions/prevloc.rb b/app/models/form/lettings/questions/prevloc.rb
index 4ad7dbf11..0bf445956 100644
--- a/app/models/form/lettings/questions/prevloc.rb
+++ b/app/models/form/lettings/questions/prevloc.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::Prevloc < ::Form::Question
     @type = "select"
     @inferred_check_answers_value = [{ "condition" => { "previous_la_known" => 0 }, "value" => "Not known" }]
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
@@ -14,5 +14,5 @@ class Form::Lettings::Questions::Prevloc < ::Form::Question
     { "" => "Select an option" }.merge(LocalAuthority.active(form.start_date).map { |la| [la.code, la.name] }.to_h)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 81, 2024 => 80 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 81, 2024 => 80, 2025 => 80, 2026 => 87 }.freeze
 end
diff --git a/app/models/form/lettings/questions/property_reference.rb b/app/models/form/lettings/questions/property_reference.rb
index d4587ffe8..e81d4b6a2 100644
--- a/app/models/form/lettings/questions/property_reference.rb
+++ b/app/models/form/lettings/questions/property_reference.rb
@@ -4,8 +4,8 @@ class Form::Lettings::Questions::PropertyReference < ::Form::Question
     @id = "propcode"
     @type = "text"
     @width = 10
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 8, 2024 => 10 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 8, 2024 => 10, 2025 => 10, 2026 => 10 }.freeze
 end
diff --git a/app/models/form/lettings/questions/pscharge_4_weekly.rb b/app/models/form/lettings/questions/pscharge_4_weekly.rb
index 565be72c9..233e87854 100644
--- a/app/models/form/lettings/questions/pscharge_4_weekly.rb
+++ b/app/models/form/lettings/questions/pscharge_4_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::Pscharge4Weekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every 4 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94, 2026 => 102 }.freeze
 end
diff --git a/app/models/form/lettings/questions/pscharge_bi_weekly.rb b/app/models/form/lettings/questions/pscharge_bi_weekly.rb
index b8bb94f40..dcd1df89f 100644
--- a/app/models/form/lettings/questions/pscharge_bi_weekly.rb
+++ b/app/models/form/lettings/questions/pscharge_bi_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::PschargeBiWeekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every 2 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94, 2026 => 102 }.freeze
 end
diff --git a/app/models/form/lettings/questions/pscharge_monthly.rb b/app/models/form/lettings/questions/pscharge_monthly.rb
index ccbd2655b..b5c175ceb 100644
--- a/app/models/form/lettings/questions/pscharge_monthly.rb
+++ b/app/models/form/lettings/questions/pscharge_monthly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::PschargeMonthly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every month"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94, 2026 => 102 }.freeze
 end
diff --git a/app/models/form/lettings/questions/pscharge_weekly.rb b/app/models/form/lettings/questions/pscharge_weekly.rb
index 9b0a0e320..4bf327c08 100644
--- a/app/models/form/lettings/questions/pscharge_weekly.rb
+++ b/app/models/form/lettings/questions/pscharge_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::PschargeWeekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every week"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 96, 2025 => 94, 2026 => 102 }.freeze
 end
diff --git a/app/models/form/lettings/questions/reason.rb b/app/models/form/lettings/questions/reason.rb
index 7f0cd86a0..a40d9d134 100644
--- a/app/models/form/lettings/questions/reason.rb
+++ b/app/models/form/lettings/questions/reason.rb
@@ -10,7 +10,7 @@ class Form::Lettings::Questions::Reason < ::Form::Question
         20,
       ],
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -132,5 +132,5 @@ class Form::Lettings::Questions::Reason < ::Form::Question
     }.freeze,
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2024 => 76 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2024 => 76, 2025 => 76, 2026 => 83 }.freeze
 end
diff --git a/app/models/form/lettings/questions/reason_renewal.rb b/app/models/form/lettings/questions/reason_renewal.rb
index c00bd2581..d5fccca67 100644
--- a/app/models/form/lettings/questions/reason_renewal.rb
+++ b/app/models/form/lettings/questions/reason_renewal.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReasonRenewal < ::Form::Question
     @type = "radio"
     @copy_key = "lettings.household_situation.reason.#{page.id}.reason"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @conditional_for = {
       "reasonother" => [
         20,
@@ -37,5 +37,5 @@ class Form::Lettings::Questions::ReasonRenewal < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 76 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 76, 2025 => 76, 2026 => 83 }.freeze
 end
diff --git a/app/models/form/lettings/questions/reasonable_preference_reason.rb b/app/models/form/lettings/questions/reasonable_preference_reason.rb
index 75b450b91..485ad830f 100644
--- a/app/models/form/lettings/questions/reasonable_preference_reason.rb
+++ b/app/models/form/lettings/questions/reasonable_preference_reason.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::ReasonablePreferenceReason < ::Form::Question
     @type = "checkbox"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -17,5 +17,5 @@ class Form::Lettings::Questions::ReasonablePreferenceReason < ::Form::Question
     "rp_dontknow" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 83, 2024 => 82 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 83, 2024 => 82, 2025 => 82, 2026 => 89 }.freeze
 end
diff --git a/app/models/form/lettings/questions/reasonother.rb b/app/models/form/lettings/questions/reasonother.rb
index 7e600916b..b92a7b8f4 100644
--- a/app/models/form/lettings/questions/reasonother.rb
+++ b/app/models/form/lettings/questions/reasonother.rb
@@ -5,8 +5,8 @@ class Form::Lettings::Questions::Reasonother < ::Form::Question
     @copy_key = "lettings.household_situation.reason.#{@page.id}.reasonother"
     @type = "text"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 76 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 77, 2024 => 76, 2025 => 76, 2026 => 83 }.freeze
 end
diff --git a/app/models/form/lettings/questions/reasonpref.rb b/app/models/form/lettings/questions/reasonpref.rb
index e63f65584..f54e98c15 100644
--- a/app/models/form/lettings/questions/reasonpref.rb
+++ b/app/models/form/lettings/questions/reasonpref.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Reasonpref < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -15,5 +15,5 @@ class Form::Lettings::Questions::Reasonpref < ::Form::Question
     "3" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 82, 2024 => 81 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 82, 2024 => 81, 2025 => 81, 2026 => 88 }.freeze
 end
diff --git a/app/models/form/lettings/questions/referral_direct.rb b/app/models/form/lettings/questions/referral_direct.rb
index d79065df7..5373f3f3f 100644
--- a/app/models/form/lettings/questions/referral_direct.rb
+++ b/app/models/form/lettings/questions/referral_direct.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::ReferralDirect < ::Form::Question
     @copy_key = "lettings.household_situation.referral.direct"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/lettings/questions/referral_general_needs.rb b/app/models/form/lettings/questions/referral_general_needs.rb
index 6c9f159e4..f2b2167a3 100644
--- a/app/models/form/lettings/questions/referral_general_needs.rb
+++ b/app/models/form/lettings/questions/referral_general_needs.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::ReferralGeneralNeeds < ::Form::Question
     @copy_key = "lettings.household_situation.referral.general_needs.la"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -93,5 +93,5 @@ class Form::Lettings::Questions::ReferralGeneralNeeds < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84, 2025 => 84 }.freeze
 end
diff --git a/app/models/form/lettings/questions/referral_general_needs_prp.rb b/app/models/form/lettings/questions/referral_general_needs_prp.rb
index 492f32c8f..37d222961 100644
--- a/app/models/form/lettings/questions/referral_general_needs_prp.rb
+++ b/app/models/form/lettings/questions/referral_general_needs_prp.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::ReferralGeneralNeedsPrp < ::Form::Question
     @copy_key = "lettings.household_situation.referral.general_needs.prp"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -102,5 +102,5 @@ class Form::Lettings::Questions::ReferralGeneralNeedsPrp < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84, 2025 => 84 }.freeze
 end
diff --git a/app/models/form/lettings/questions/referral_hsc.rb b/app/models/form/lettings/questions/referral_hsc.rb
index f049b6359..d589768a5 100644
--- a/app/models/form/lettings/questions/referral_hsc.rb
+++ b/app/models/form/lettings/questions/referral_hsc.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::ReferralHsc < ::Form::Question
     @copy_key = "lettings.household_situation.referral.hsc"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/lettings/questions/referral_justice.rb b/app/models/form/lettings/questions/referral_justice.rb
index f222f5fe8..ccd836a2f 100644
--- a/app/models/form/lettings/questions/referral_justice.rb
+++ b/app/models/form/lettings/questions/referral_justice.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::ReferralJustice < ::Form::Question
     @copy_key = "lettings.household_situation.referral.justice"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/lettings/questions/referral_la.rb b/app/models/form/lettings/questions/referral_la.rb
index 352457964..ede72194c 100644
--- a/app/models/form/lettings/questions/referral_la.rb
+++ b/app/models/form/lettings/questions/referral_la.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::ReferralLa < ::Form::Question
     @copy_key = "lettings.household_situation.referral.la"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/lettings/questions/referral_prp.rb b/app/models/form/lettings/questions/referral_prp.rb
index 825967a3f..b0aed7b98 100644
--- a/app/models/form/lettings/questions/referral_prp.rb
+++ b/app/models/form/lettings/questions/referral_prp.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::ReferralPrp < ::Form::Question
     @copy_key = "lettings.household_situation.referral.prp"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/lettings/questions/referral_supported_housing.rb b/app/models/form/lettings/questions/referral_supported_housing.rb
index 3a7ba04ac..2caddc8e2 100644
--- a/app/models/form/lettings/questions/referral_supported_housing.rb
+++ b/app/models/form/lettings/questions/referral_supported_housing.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::ReferralSupportedHousing < ::Form::Question
     @copy_key = "lettings.household_situation.referral.supported_housing.la"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -93,5 +93,5 @@ class Form::Lettings::Questions::ReferralSupportedHousing < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84, 2025 => 84 }.freeze
 end
diff --git a/app/models/form/lettings/questions/referral_supported_housing_prp.rb b/app/models/form/lettings/questions/referral_supported_housing_prp.rb
index d0236f4af..89f02a723 100644
--- a/app/models/form/lettings/questions/referral_supported_housing_prp.rb
+++ b/app/models/form/lettings/questions/referral_supported_housing_prp.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::ReferralSupportedHousingPrp < ::Form::Question
     @copy_key = "lettings.household_situation.referral.supported_housing.prp"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -105,5 +105,5 @@ class Form::Lettings::Questions::ReferralSupportedHousingPrp < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84, 2025 => 84 }.freeze
 end
diff --git a/app/models/form/lettings/questions/referral_type.rb b/app/models/form/lettings/questions/referral_type.rb
index b4bb87515..b84e85155 100644
--- a/app/models/form/lettings/questions/referral_type.rb
+++ b/app/models/form/lettings/questions/referral_type.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::ReferralType < ::Form::Question
     @copy_key = "lettings.household_situation.referral.type"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/lettings/questions/renewal.rb b/app/models/form/lettings/questions/renewal.rb
index e78d98247..71007166b 100644
--- a/app/models/form/lettings/questions/renewal.rb
+++ b/app/models/form/lettings/questions/renewal.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::Renewal < ::Form::Question
     @id = "renewal"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
   end
 
   ANSWER_OPTIONS = {
@@ -13,5 +13,5 @@ class Form::Lettings::Questions::Renewal < ::Form::Question
   }
   .freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 4, 2024 => 6 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 4, 2024 => 6, 2025 => 6, 2026 => 6 }.freeze
 end
diff --git a/app/models/form/lettings/questions/rent_type.rb b/app/models/form/lettings/questions/rent_type.rb
index 7700c5284..5940c18dc 100644
--- a/app/models/form/lettings/questions/rent_type.rb
+++ b/app/models/form/lettings/questions/rent_type.rb
@@ -7,7 +7,7 @@ class Form::Lettings::Questions::RentType < ::Form::Question
     @top_guidance_partial = "rent_type_definitions"
     @answer_options = answer_options
     @conditional_for = { "irproduct_other" => [5] }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
   end
 
   ANSWER_OPTIONS = {
@@ -29,7 +29,7 @@ class Form::Lettings::Questions::RentType < ::Form::Question
     "6" => { "value" => "Specified accommodation - exempt accommodation, managed properties, refuges and local authority hostels" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 6, 2024 => 8 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 6, 2024 => 8, 2025 => 8, 2026 => 8 }.freeze
 
   def answer_options
     form.start_year_2025_or_later? ? ANSWER_OPTIONS_2025 : ANSWER_OPTIONS
diff --git a/app/models/form/lettings/questions/reservist.rb b/app/models/form/lettings/questions/reservist.rb
index 023f1655d..f6e97c3d8 100644
--- a/app/models/form/lettings/questions/reservist.rb
+++ b/app/models/form/lettings/questions/reservist.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Reservist < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -15,5 +15,5 @@ class Form::Lettings::Questions::Reservist < ::Form::Question
     "3" => { "value" => "Person prefers not to say" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 68, 2024 => 67 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 68, 2024 => 67, 2025 => 67, 2026 => 74 }.freeze
 end
diff --git a/app/models/form/lettings/questions/rsnvac.rb b/app/models/form/lettings/questions/rsnvac.rb
index 42c8d9f92..48523b284 100644
--- a/app/models/form/lettings/questions/rsnvac.rb
+++ b/app/models/form/lettings/questions/rsnvac.rb
@@ -3,7 +3,7 @@ class Form::Lettings::Questions::Rsnvac < ::Form::Question
     super
     @id = "rsnvac"
     @type = "radio"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -98,5 +98,5 @@ class Form::Lettings::Questions::Rsnvac < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 17, 2024 => 18, 2025 => 15 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 17, 2024 => 18, 2025 => 15, 2026 => 15 }.freeze
 end
diff --git a/app/models/form/lettings/questions/rsnvac_first_let.rb b/app/models/form/lettings/questions/rsnvac_first_let.rb
index 01389871c..16d6219b6 100644
--- a/app/models/form/lettings/questions/rsnvac_first_let.rb
+++ b/app/models/form/lettings/questions/rsnvac_first_let.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::RsnvacFirstLet < ::Form::Question
     @id = "rsnvac"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -13,5 +13,5 @@ class Form::Lettings::Questions::RsnvacFirstLet < ::Form::Question
     "15" => { "value" => "First let of new-build property" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16, 2025 => 13 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16, 2025 => 13, 2026 => 13 }.freeze
 end
diff --git a/app/models/form/lettings/questions/scharge_4_weekly.rb b/app/models/form/lettings/questions/scharge_4_weekly.rb
index 8c4156774..e95f5b1d2 100644
--- a/app/models/form/lettings/questions/scharge_4_weekly.rb
+++ b/app/models/form/lettings/questions/scharge_4_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::Scharge4Weekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every 4 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93, 2026 => 101 }.freeze
 end
diff --git a/app/models/form/lettings/questions/scharge_bi_weekly.rb b/app/models/form/lettings/questions/scharge_bi_weekly.rb
index 7803f8b37..24904797e 100644
--- a/app/models/form/lettings/questions/scharge_bi_weekly.rb
+++ b/app/models/form/lettings/questions/scharge_bi_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::SchargeBiWeekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every 2 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93, 2026 => 101 }.freeze
 end
diff --git a/app/models/form/lettings/questions/scharge_monthly.rb b/app/models/form/lettings/questions/scharge_monthly.rb
index 073d4a772..631192bd4 100644
--- a/app/models/form/lettings/questions/scharge_monthly.rb
+++ b/app/models/form/lettings/questions/scharge_monthly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::SchargeMonthly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every month"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93, 2026 => 101 }.freeze
 end
diff --git a/app/models/form/lettings/questions/scharge_weekly.rb b/app/models/form/lettings/questions/scharge_weekly.rb
index b6befbad3..5f8aa9843 100644
--- a/app/models/form/lettings/questions/scharge_weekly.rb
+++ b/app/models/form/lettings/questions/scharge_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::SchargeWeekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every week"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 95, 2025 => 93, 2026 => 101 }.freeze
 end
diff --git a/app/models/form/lettings/questions/scheme_id.rb b/app/models/form/lettings/questions/scheme_id.rb
index 862ef3130..c9b371f40 100644
--- a/app/models/form/lettings/questions/scheme_id.rb
+++ b/app/models/form/lettings/questions/scheme_id.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::SchemeId < ::Form::Question
     @answer_options = answer_options
     @top_guidance_partial = "finding_scheme"
     @bottom_guidance_partial = "scheme_selection"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
     @inferred_answers = {
       "location.name": {
         "scheme_has_multiple_locations?": false,
@@ -56,5 +56,5 @@ private
     false
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 9, 2024 => 4 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 9, 2024 => 4, 2025 => 4, 2026 => 4 }.freeze
 end
diff --git a/app/models/form/lettings/questions/sheltered.rb b/app/models/form/lettings/questions/sheltered.rb
index 35a16ae05..ca684c7af 100644
--- a/app/models/form/lettings/questions/sheltered.rb
+++ b/app/models/form/lettings/questions/sheltered.rb
@@ -3,7 +3,7 @@ class Form::Lettings::Questions::Sheltered < ::Form::Question
     super
     @id = "sheltered"
     @type = "radio"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -27,5 +27,5 @@ class Form::Lettings::Questions::Sheltered < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 29, 2024 => 29, 2025 => 25 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 29, 2024 => 29, 2025 => 25, 2026 => 24 }.freeze
 end
diff --git a/app/models/form/lettings/questions/starter_tenancy_type.rb b/app/models/form/lettings/questions/starter_tenancy_type.rb
index dfda74bc0..4224781bd 100644
--- a/app/models/form/lettings/questions/starter_tenancy_type.rb
+++ b/app/models/form/lettings/questions/starter_tenancy_type.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::StarterTenancyType < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @conditional_for = { "tenancyother" => [3] }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -65,5 +65,5 @@ class Form::Lettings::Questions::StarterTenancyType < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 27, 2025 => 28 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 27, 2025 => 28, 2026 => 27 }.freeze
 end
diff --git a/app/models/form/lettings/questions/startertenancy.rb b/app/models/form/lettings/questions/startertenancy.rb
index 6bec6a360..464e5d3a6 100644
--- a/app/models/form/lettings/questions/startertenancy.rb
+++ b/app/models/form/lettings/questions/startertenancy.rb
@@ -5,10 +5,10 @@ class Form::Lettings::Questions::Startertenancy < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "2" => { "value" => "No" } }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 26, 2024 => 26, 2025 => 27 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 26, 2024 => 26, 2025 => 27, 2026 => 26 }.freeze
 end
diff --git a/app/models/form/lettings/questions/stock_owner.rb b/app/models/form/lettings/questions/stock_owner.rb
index 466b08e3f..6d2ee1d64 100644
--- a/app/models/form/lettings/questions/stock_owner.rb
+++ b/app/models/form/lettings/questions/stock_owner.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question
     @id = "owning_organisation_id"
     @derived = true
     @type = "select"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
   end
 
   def answer_options(log = nil, user = nil)
@@ -86,5 +86,5 @@ private
     "#{name} (inactive as of #{merge_date.to_fs(:govuk_date)})"
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 1 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 1, 2024 => 1, 2025 => 1, 2026 => 1 }.freeze
 end
diff --git a/app/models/form/lettings/questions/supcharg_4_weekly.rb b/app/models/form/lettings/questions/supcharg_4_weekly.rb
index 227aead7a..1e3c502b2 100644
--- a/app/models/form/lettings/questions/supcharg_4_weekly.rb
+++ b/app/models/form/lettings/questions/supcharg_4_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::Supcharg4Weekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every 4 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 98, 2024 => 97, 2025 => 95 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 98, 2024 => 97, 2025 => 95, 2026 => 103 }.freeze
 end
diff --git a/app/models/form/lettings/questions/supcharg_bi_weekly.rb b/app/models/form/lettings/questions/supcharg_bi_weekly.rb
index e01783122..4ad8048b8 100644
--- a/app/models/form/lettings/questions/supcharg_bi_weekly.rb
+++ b/app/models/form/lettings/questions/supcharg_bi_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::SupchargBiWeekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every 2 weeks"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 98, 2024 => 97, 2025 => 95 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 98, 2024 => 97, 2025 => 95, 2026 => 103 }.freeze
 end
diff --git a/app/models/form/lettings/questions/supcharg_monthly.rb b/app/models/form/lettings/questions/supcharg_monthly.rb
index 25da179d2..85060eda9 100644
--- a/app/models/form/lettings/questions/supcharg_monthly.rb
+++ b/app/models/form/lettings/questions/supcharg_monthly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::SupchargMonthly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every month"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 98, 2024 => 97, 2025 => 95 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 98, 2024 => 97, 2025 => 95, 2026 => 103 }.freeze
 end
diff --git a/app/models/form/lettings/questions/supcharg_weekly.rb b/app/models/form/lettings/questions/supcharg_weekly.rb
index c6f7a666d..e34473e17 100644
--- a/app/models/form/lettings/questions/supcharg_weekly.rb
+++ b/app/models/form/lettings/questions/supcharg_weekly.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::SupchargWeekly < ::Form::Question
     @result_field = "tcharge"
     @prefix = "£"
     @suffix = " every week"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 98, 2024 => 97, 2025 => 95 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 98, 2024 => 97, 2025 => 95, 2026 => 103 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tenancy_length.rb b/app/models/form/lettings/questions/tenancy_length.rb
index a3155f8c0..27ac9dbdc 100644
--- a/app/models/form/lettings/questions/tenancy_length.rb
+++ b/app/models/form/lettings/questions/tenancy_length.rb
@@ -9,8 +9,8 @@ class Form::Lettings::Questions::TenancyLength < ::Form::Question
     @max = 150
     @min = 0
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 28, 2025 => 29 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 28, 2025 => 29, 2026 => 28 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tenancy_length_affordable_rent.rb b/app/models/form/lettings/questions/tenancy_length_affordable_rent.rb
index 58b83fe90..f26adbe6f 100644
--- a/app/models/form/lettings/questions/tenancy_length_affordable_rent.rb
+++ b/app/models/form/lettings/questions/tenancy_length_affordable_rent.rb
@@ -9,8 +9,8 @@ class Form::Lettings::Questions::TenancyLengthAffordableRent < ::Form::Question
     @max = 150
     @min = 0
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 28, 2025 => 29 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 28, 2025 => 29, 2026 => 28 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tenancy_length_intermediate_rent.rb b/app/models/form/lettings/questions/tenancy_length_intermediate_rent.rb
index c85583d95..ed3a13b0c 100644
--- a/app/models/form/lettings/questions/tenancy_length_intermediate_rent.rb
+++ b/app/models/form/lettings/questions/tenancy_length_intermediate_rent.rb
@@ -9,8 +9,8 @@ class Form::Lettings::Questions::TenancyLengthIntermediateRent < ::Form::Questio
     @max = 150
     @min = 0
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 28, 2025 => 29 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 28, 2025 => 29, 2026 => 28 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tenancy_length_periodic.rb b/app/models/form/lettings/questions/tenancy_length_periodic.rb
index e7f9336ec..85041680e 100644
--- a/app/models/form/lettings/questions/tenancy_length_periodic.rb
+++ b/app/models/form/lettings/questions/tenancy_length_periodic.rb
@@ -9,8 +9,8 @@ class Form::Lettings::Questions::TenancyLengthPeriodic < ::Form::Question
     @max = 150
     @min = 0
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 28, 2025 => 29 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 28, 2025 => 29, 2026 => 28 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tenancy_other.rb b/app/models/form/lettings/questions/tenancy_other.rb
index 8a8a94108..6f455fead 100644
--- a/app/models/form/lettings/questions/tenancy_other.rb
+++ b/app/models/form/lettings/questions/tenancy_other.rb
@@ -5,8 +5,8 @@ class Form::Lettings::Questions::TenancyOther < ::Form::Question
     @copy_key = "lettings.tenancy_information.tenancy.#{page.id}.tenancyother"
     @type = "text"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 27, 2025 => 28 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 27, 2025 => 28, 2026 => 27 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tenancy_start_date.rb b/app/models/form/lettings/questions/tenancy_start_date.rb
index b7d82b399..fc5137626 100644
--- a/app/models/form/lettings/questions/tenancy_start_date.rb
+++ b/app/models/form/lettings/questions/tenancy_start_date.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::TenancyStartDate < ::Form::Question
     @id = "startdate"
     @type = "date"
     @unresolved_hint_text = "Some scheme details have changed, and now this log needs updating. Check that the tenancy start date is correct."
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
   end
 
   def date_example_override(log)
@@ -20,5 +20,5 @@ class Form::Lettings::Questions::TenancyStartDate < ::Form::Question
     I18n.t("forms.#{form.start_date.year}.#{copy_key}.example", default: "", example_date:)
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 5, 2024 => 7 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 5, 2024 => 7, 2025 => 7, 2026 => 7 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tenancy_type.rb b/app/models/form/lettings/questions/tenancy_type.rb
index 96fda2687..d2b9a5925 100644
--- a/app/models/form/lettings/questions/tenancy_type.rb
+++ b/app/models/form/lettings/questions/tenancy_type.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::TenancyType < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @conditional_for = { "tenancyother" => [3] }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -65,5 +65,5 @@ class Form::Lettings::Questions::TenancyType < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 27, 2025 => 28 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 27, 2024 => 27, 2025 => 28, 2026 => 27 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tenancyother_value_check.rb b/app/models/form/lettings/questions/tenancyother_value_check.rb
new file mode 100644
index 000000000..309de7169
--- /dev/null
+++ b/app/models/form/lettings/questions/tenancyother_value_check.rb
@@ -0,0 +1,13 @@
+class Form::Lettings::Questions::TenancyotherValueCheck < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "tenancyother_value_check"
+    @copy_key = "lettings.soft_validations.tenancyother_value_check"
+    @type = "interruption_screen"
+    @check_answers_card_number = 0
+    @answer_options = ANSWER_OPTIONS
+    @hidden_in_check_answers = { "depends_on" => [{ "tenancyother_value_check" => 0 }, { "tenancyother_value_check" => 1 }] }
+  end
+
+  ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
+end
diff --git a/app/models/form/lettings/questions/tenant_code.rb b/app/models/form/lettings/questions/tenant_code.rb
index 7b7be3cac..36b3d0aee 100644
--- a/app/models/form/lettings/questions/tenant_code.rb
+++ b/app/models/form/lettings/questions/tenant_code.rb
@@ -4,8 +4,8 @@ class Form::Lettings::Questions::TenantCode < ::Form::Question
     @id = "tenancycode"
     @type = "text"
     @width = 10
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] if form.start_date.present?
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR) if form.start_date.present?
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 7, 2024 => 9 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 7, 2024 => 9, 2025 => 9, 2026 => 9 }.freeze
 end
diff --git a/app/models/form/lettings/questions/town_or_city.rb b/app/models/form/lettings/questions/town_or_city.rb
index 5673b7f01..6db52c92d 100644
--- a/app/models/form/lettings/questions/town_or_city.rb
+++ b/app/models/form/lettings/questions/town_or_city.rb
@@ -6,9 +6,9 @@ class Form::Lettings::Questions::TownOrCity < ::Form::Question
     @type = "text"
     @plain_label = true
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17, 2026 => 17 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tshortfall.rb b/app/models/form/lettings/questions/tshortfall.rb
index ced2a426a..a271f9e06 100644
--- a/app/models/form/lettings/questions/tshortfall.rb
+++ b/app/models/form/lettings/questions/tshortfall.rb
@@ -21,9 +21,9 @@ class Form::Lettings::Questions::Tshortfall < ::Form::Question
       { "label" => " every week for 52 weeks", "depends_on" => { "period" => 1 } },
       { "label" => " every week for 53 weeks", "depends_on" => { "period" => 10 } },
     ]
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 100, 2024 => 99, 2025 => 97 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 100, 2024 => 99, 2025 => 97, 2026 => 105 }.freeze
 end
diff --git a/app/models/form/lettings/questions/tshortfall_known.rb b/app/models/form/lettings/questions/tshortfall_known.rb
index 8ba0b038c..97b41a09b 100644
--- a/app/models/form/lettings/questions/tshortfall_known.rb
+++ b/app/models/form/lettings/questions/tshortfall_known.rb
@@ -7,10 +7,10 @@ class Form::Lettings::Questions::TshortfallKnown < ::Form::Question
     @check_answers_card_number = 0
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "tshortfall" => [0] }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 100, 2024 => 99, 2025 => 97 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 100, 2024 => 99, 2025 => 97, 2026 => 105 }.freeze
 end
diff --git a/app/models/form/lettings/questions/unittype_gn.rb b/app/models/form/lettings/questions/unittype_gn.rb
index ad8298929..34391bf83 100644
--- a/app/models/form/lettings/questions/unittype_gn.rb
+++ b/app/models/form/lettings/questions/unittype_gn.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::UnittypeGn < ::Form::Question
     @id = "unittype_gn"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -18,5 +18,5 @@ class Form::Lettings::Questions::UnittypeGn < ::Form::Question
     "6" => { "value" => "Other" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 19 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 19, 2024 => 19, 2025 => 19, 2026 => 19 }.freeze
 end
diff --git a/app/models/form/lettings/questions/uprn.rb b/app/models/form/lettings/questions/uprn.rb
index 7f1f240f9..98ffb75c2 100644
--- a/app/models/form/lettings/questions/uprn.rb
+++ b/app/models/form/lettings/questions/uprn.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Uprn < ::Form::Question
     @copy_key = "lettings.property_information.uprn.uprn"
     @type = "text"
     @width = 10
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @inferred_check_answers_value = [
       {
         "condition" => { "uprn_known" => 0 },
@@ -35,5 +35,5 @@ class Form::Lettings::Questions::Uprn < ::Form::Question
     "\n\n#{value.join("\n")}"
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 12, 2025 => 16 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 12, 2025 => 16, 2026 => 16 }.freeze
 end
diff --git a/app/models/form/lettings/questions/uprn_known.rb b/app/models/form/lettings/questions/uprn_known.rb
index 6ac70e415..5dab0f35a 100644
--- a/app/models/form/lettings/questions/uprn_known.rb
+++ b/app/models/form/lettings/questions/uprn_known.rb
@@ -18,7 +18,7 @@ class Form::Lettings::Questions::UprnKnown < ::Form::Question
         { "uprn_known" => 1 },
       ],
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -30,5 +30,5 @@ class Form::Lettings::Questions::UprnKnown < ::Form::Question
     I18n.t("validations.property.uprn_known.invalid")
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 12, 2025 => 16 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 12, 2025 => 16, 2026 => 16 }.freeze
 end
diff --git a/app/models/form/lettings/questions/voiddate.rb b/app/models/form/lettings/questions/voiddate.rb
index 3bce8a7b8..afdbb01ae 100644
--- a/app/models/form/lettings/questions/voiddate.rb
+++ b/app/models/form/lettings/questions/voiddate.rb
@@ -3,9 +3,9 @@ class Form::Lettings::Questions::Voiddate < ::Form::Question
     super
     @id = "voiddate"
     @type = "date"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @top_guidance_partial = "void_date"
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 23 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 23, 2024 => 23, 2025 => 23, 2026 => 22 }.freeze
 end
diff --git a/app/models/form/lettings/questions/waityear.rb b/app/models/form/lettings/questions/waityear.rb
index 5c81fdedc..7e0f2b77e 100644
--- a/app/models/form/lettings/questions/waityear.rb
+++ b/app/models/form/lettings/questions/waityear.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::Waityear < ::Form::Question
     @id = "waityear"
     @type = "radio"
     @check_answers_card_number = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -49,5 +49,5 @@ class Form::Lettings::Questions::Waityear < ::Form::Question
     }.freeze
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 76, 2024 => 75 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 76, 2024 => 75, 2025 => 75, 2026 => 82 }.freeze
 end
diff --git a/app/models/form/lettings/questions/wheelchair.rb b/app/models/form/lettings/questions/wheelchair.rb
index 9da5399e6..289e298f5 100644
--- a/app/models/form/lettings/questions/wheelchair.rb
+++ b/app/models/form/lettings/questions/wheelchair.rb
@@ -4,7 +4,7 @@ class Form::Lettings::Questions::Wheelchair < ::Form::Question
     @id = "wchair"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
@@ -12,5 +12,5 @@ class Form::Lettings::Questions::Wheelchair < ::Form::Question
     "2" => { "value" => "No" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 21 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 21, 2024 => 21, 2025 => 21, 2026 => 20 }.freeze
 end
diff --git a/app/models/form/lettings/questions/working_situation1.rb b/app/models/form/lettings/questions/working_situation1.rb
index 6098eb136..0a0221579 100644
--- a/app/models/form/lettings/questions/working_situation1.rb
+++ b/app/models/form/lettings/questions/working_situation1.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::WorkingSituation1 < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = answer_options
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
@@ -40,5 +40,5 @@ class Form::Lettings::Questions::WorkingSituation1 < ::Form::Question
     end
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 37, 2024 => 36 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 37, 2024 => 36, 2025 => 36, 2026 => 36 }.freeze
 end
diff --git a/app/models/form/lettings/subsections/tenancy_information.rb b/app/models/form/lettings/subsections/tenancy_information.rb
index b65039b8d..e6ff48457 100644
--- a/app/models/form/lettings/subsections/tenancy_information.rb
+++ b/app/models/form/lettings/subsections/tenancy_information.rb
@@ -12,6 +12,7 @@ class Form::Lettings::Subsections::TenancyInformation < ::Form::Subsection
       Form::Lettings::Pages::StarterTenancy.new("starter_tenancy", nil, self),
       Form::Lettings::Pages::TenancyType.new(nil, nil, self),
       Form::Lettings::Pages::StarterTenancyType.new(nil, nil, self),
+      (Form::Lettings::Pages::TenancyotherValueCheck.new(nil, nil, self) if form.start_year_2026_or_later?),
       Form::Lettings::Pages::TenancyLength.new(nil, nil, self),
       Form::Lettings::Pages::TenancyLengthAffordableRent.new(nil, nil, self),
       Form::Lettings::Pages::TenancyLengthIntermediateRent.new(nil, nil, self),
diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index e5bc0c9a6..be90899f9 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -367,7 +367,7 @@ private
     inferred_answer["value"] if inferred_answer.present?
   end
 
-  # every year currently visible should be specified.
+  # every year currently visible should have an explicit question number specified.
   # however, form_handler.rb will still initialise the next form even if its not visible.
   # so we have a fallback to the latest year for these future years so all question have a question number.
   def get_question_number_from_hash(hash)
diff --git a/app/models/form/sales/pages/deposit.rb b/app/models/form/sales/pages/deposit.rb
index 4fc5e1b83..411cfb270 100644
--- a/app/models/form/sales/pages/deposit.rb
+++ b/app/models/form/sales/pages/deposit.rb
@@ -23,6 +23,7 @@ class Form::Sales::Pages::Deposit < ::Form::Page
   def copy_key
     return "sales.sale_information.deposit.shared_ownership" if @ownershipsch == 1
     return "sales.sale_information.deposit.discounted_ownership" if @ownershipsch == 2
-    return "sales.sale_information.deposit.outright_sale" if @ownershipsch == 3
+
+    "sales.sale_information.deposit.outright_sale" if @ownershipsch == 3
   end
 end
diff --git a/app/models/form/sales/questions/deposit_amount.rb b/app/models/form/sales/questions/deposit_amount.rb
index 9fe7a7ce1..ede6335e1 100644
--- a/app/models/form/sales/questions/deposit_amount.rb
+++ b/app/models/form/sales/questions/deposit_amount.rb
@@ -29,12 +29,14 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question
   def top_guidance_partial
     return "financial_calculations_shared_ownership" if @ownershipsch == 1
     return "financial_calculations_discounted_ownership" if @ownershipsch == 2
-    return "financial_calculations_outright_sale" if @ownershipsch == 3
+
+    "financial_calculations_outright_sale" if @ownershipsch == 3
   end
 
   def copy_key
     return "sales.sale_information.deposit.shared_ownership" if @ownershipsch == 1
     return "sales.sale_information.deposit.discounted_ownership" if @ownershipsch == 2
-    return "sales.sale_information.deposit.outright_sale" if @ownershipsch == 3
+
+    "sales.sale_information.deposit.outright_sale" if @ownershipsch == 3
   end
 end
diff --git a/app/models/form/sales/questions/mortgage_amount.rb b/app/models/form/sales/questions/mortgage_amount.rb
index 0d2bda4fd..a61dce8f3 100644
--- a/app/models/form/sales/questions/mortgage_amount.rb
+++ b/app/models/form/sales/questions/mortgage_amount.rb
@@ -26,6 +26,7 @@ class Form::Sales::Questions::MortgageAmount < ::Form::Question
   def top_guidance_partial
     return "financial_calculations_shared_ownership" if @ownershipsch == 1
     return "financial_calculations_discounted_ownership" if @ownershipsch == 2
-    return "financial_calculations_outright_sale" if @ownershipsch == 3
+
+    "financial_calculations_outright_sale" if @ownershipsch == 3
   end
 end
diff --git a/app/models/form/sales/questions/mortgageused.rb b/app/models/form/sales/questions/mortgageused.rb
index a0079b1b4..fc5818886 100644
--- a/app/models/form/sales/questions/mortgageused.rb
+++ b/app/models/form/sales/questions/mortgageused.rb
@@ -41,6 +41,7 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
   def top_guidance_partial
     return "financial_calculations_shared_ownership" if @ownershipsch == 1
     return "financial_calculations_discounted_ownership" if @ownershipsch == 2
-    return "financial_calculations_outright_sale" if @ownershipsch == 3
+
+    "financial_calculations_outright_sale" if @ownershipsch == 3
   end
 end
diff --git a/app/models/form/sales/questions/purchase_price.rb b/app/models/form/sales/questions/purchase_price.rb
index 56810eae4..d37d549ce 100644
--- a/app/models/form/sales/questions/purchase_price.rb
+++ b/app/models/form/sales/questions/purchase_price.rb
@@ -30,6 +30,7 @@ class Form::Sales::Questions::PurchasePrice < ::Form::Question
 
   def top_guidance_partial
     return "financial_calculations_discounted_ownership" if @ownership_sch == 2
-    return "financial_calculations_outright_sale" if @ownership_sch == 3
+
+    "financial_calculations_outright_sale" if @ownership_sch == 3
   end
 end
diff --git a/app/models/form/subsection.rb b/app/models/form/subsection.rb
index 3b74e29a5..41431b06f 100644
--- a/app/models/form/subsection.rb
+++ b/app/models/form/subsection.rb
@@ -1,5 +1,5 @@
 class Form::Subsection
-  attr_accessor :id, :label, :section, :pages, :depends_on, :form
+  attr_accessor :id, :label, :section, :pages, :depends_on
 
   def initialize(id, hsh, section)
     @id = id
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index c3b72fbdd..d70d0e012 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -482,7 +482,7 @@ class LettingsLog < Log
   def is_london_rent?
     # 2: London Affordable Rent
     # 4: London Living Rent
-    rent_type == 2 || rent_type == 4
+    [2, 4].include?(rent_type)
   end
 
   def previous_tenancy_was_foster_care?
@@ -714,7 +714,7 @@ class LettingsLog < Log
   end
 
   def affordable_or_social_rent?
-    renttype == 1 || renttype == 2
+    [1, 2].include?(renttype)
   end
 
   def no_or_unknown_other_housing_needs?
@@ -931,7 +931,7 @@ private
     num_of_weeks = NUM_OF_WEEKS_FROM_PERIOD[period]
     return "" unless value && num_of_weeks
 
-    format_as_currency((value * 52 / num_of_weeks))
+    format_as_currency(value * 52 / num_of_weeks)
   end
 
   def fully_wheelchair_accessible?
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index d4d23f44d..cf9e0dd44 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -533,7 +533,7 @@ class SalesLog < Log
   end
 
   def is_not_staircasing?
-    staircase == 2 || staircase == 3
+    [2, 3].include?(staircase)
   end
 
   def stairowned_100?
diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb
index f34eec790..063c16599 100644
--- a/app/models/validations/sales/sale_information_validations.rb
+++ b/app/models/validations/sales/sale_information_validations.rb
@@ -136,7 +136,7 @@ module Validations::Sales::SaleInformationValidations
 
   def validate_grant_amount(record)
     return unless record.saledate && record.form.start_year_2024_or_later?
-    return unless record.grant && (record.type == 8 || record.type == 21)
+    return unless record.grant && [8, 21].include?(record.type)
 
     unless record.grant.between?(9_000, 16_000)
       record.errors.add :grant, I18n.t("validations.sales.sale_information.grant.out_of_range")
diff --git a/app/models/validations/sales/soft_validations.rb b/app/models/validations/sales/soft_validations.rb
index 2bc574774..3569c379f 100644
--- a/app/models/validations/sales/soft_validations.rb
+++ b/app/models/validations/sales/soft_validations.rb
@@ -144,7 +144,7 @@ module Validations::Sales::SoftValidations
 
   def grant_outside_common_range?
     return unless grant && type && saledate
-    return if form.start_year_2024_or_later? && (type == 21 || type == 8)
+    return if form.start_year_2024_or_later? && [21, 8].include?(type)
 
     !grant.between?(9_000, 16_000)
   end
diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb
index 530735213..4558a5a36 100644
--- a/app/models/validations/shared_validations.rb
+++ b/app/models/validations/shared_validations.rb
@@ -56,11 +56,11 @@ module Validations::SharedValidations
 
       next unless incorrect_accuracy
 
-      case question.step
-      when 0.01 then record.errors.add question.id.to_sym, I18n.t("validations.shared.numeric.nearest_hundredth", field:)
-      when 0.1 then record.errors.add question.id.to_sym, I18n.t("validations.shared.numeric.nearest_tenth", field:)
-      when 1 then record.errors.add question.id.to_sym, :not_integer, message: I18n.t("validations.shared.numeric.whole_number", field:)
-      when 10 then record.errors.add question.id.to_sym, I18n.t("validations.shared.numeric.nearest_ten", field:)
+      case question.step.to_d
+      when BigDecimal("0.01") then record.errors.add question.id.to_sym, I18n.t("validations.shared.numeric.nearest_hundredth", field:)
+      when BigDecimal("0.1") then record.errors.add question.id.to_sym, I18n.t("validations.shared.numeric.nearest_tenth", field:)
+      when BigDecimal("1") then record.errors.add question.id.to_sym, :not_integer, message: I18n.t("validations.shared.numeric.whole_number", field:)
+      when BigDecimal("10") then record.errors.add question.id.to_sym, I18n.t("validations.shared.numeric.nearest_ten", field:)
       else
         record.errors.add question.id.to_sym, I18n.t("validations.shared.numeric.nearest_step", field:, step: question.step)
       end
diff --git a/app/models/validations/soft_validations.rb b/app/models/validations/soft_validations.rb
index 9b6816dd1..ea17d0601 100644
--- a/app/models/validations/soft_validations.rb
+++ b/app/models/validations/soft_validations.rb
@@ -194,6 +194,16 @@ module Validations::SoftValidations
     PHRASES_LIKELY_TO_INDICATE_EXISTING_REASON_CATEGORY_REGEX.match?(reasonother)
   end
 
+  PHRASES_LIKELY_TO_INDICATE_INTRODUCTORY_OR_STARTER_PERIOD = %w[introductory intro starter].freeze
+
+  PHRASES_LIKELY_TO_INDICATE_INTRODUCTORY_OR_STARTER_PERIOD_REGEX = Regexp.union(
+    PHRASES_LIKELY_TO_INDICATE_INTRODUCTORY_OR_STARTER_PERIOD.map { |phrase| Regexp.new("\\b[^[:alpha]]*#{phrase}[^[:alpha:]]*\\b", Regexp::IGNORECASE) },
+  )
+
+  def tenancyother_might_be_introductory_or_starter_period?
+    PHRASES_LIKELY_TO_INDICATE_INTRODUCTORY_OR_STARTER_PERIOD_REGEX.match?(tenancyother)
+  end
+
   def multiple_partners?
     return unless hhmemb
 
diff --git a/app/policies/location_policy.rb b/app/policies/location_policy.rb
index 3b4a22131..966cfe35c 100644
--- a/app/policies/location_policy.rb
+++ b/app/policies/location_policy.rb
@@ -32,7 +32,7 @@ class LocationPolicy
 
   def delete?
     return false unless user.support?
-    return false unless location.status == :incomplete || location.status == :deactivated
+    return false unless %i[incomplete deactivated].include?(location.status)
 
     !has_any_logs_in_editable_collection_period
   end
diff --git a/app/policies/organisation_policy.rb b/app/policies/organisation_policy.rb
index 9c5fc4449..4db37b5ea 100644
--- a/app/policies/organisation_policy.rb
+++ b/app/policies/organisation_policy.rb
@@ -20,7 +20,7 @@ class OrganisationPolicy
 
   def delete?
     return false unless user.support?
-    return false unless organisation.status == :deactivated || organisation.status == :merged
+    return false unless %i[deactivated merged].include?(organisation.status)
 
     !has_any_logs_in_editable_collection_period
   end
diff --git a/app/policies/scheme_policy.rb b/app/policies/scheme_policy.rb
index 54a2b9e89..6fa9ac95a 100644
--- a/app/policies/scheme_policy.rb
+++ b/app/policies/scheme_policy.rb
@@ -71,7 +71,7 @@ class SchemePolicy
 
   def delete?
     return false unless user.support?
-    return false unless scheme.status == :incomplete || scheme.status == :deactivated
+    return false unless %i[incomplete deactivated].include?(scheme.status)
 
     !has_any_logs_in_editable_collection_period
   end
diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb
index 70aa4951e..1e8b9db56 100644
--- a/app/services/bulk_upload/lettings/year2023/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb
@@ -536,7 +536,7 @@ private
   end
 
   def validate_valid_radio_option
-    log.attributes.each do |question_id, _v|
+    log.attributes.each_key do |question_id|
       question = log.form.get_question(question_id, log)
 
       next unless question&.type == "radio"
@@ -1321,22 +1321,26 @@ private
 
   def scheme_field
     return :field_16 if log_uses_new_scheme_id?
-    return :field_15 if log_uses_old_scheme_id?
+
+    :field_15 if log_uses_old_scheme_id?
   end
 
   def scheme_id
     return field_16.strip if log_uses_new_scheme_id?
-    return field_15 if log_uses_old_scheme_id?
+
+    field_15 if log_uses_old_scheme_id?
   end
 
   def location_field
     return :field_17 if log_uses_new_scheme_id?
-    return :field_16 if log_uses_old_scheme_id?
+
+    :field_16 if log_uses_old_scheme_id?
   end
 
   def location_id
     return field_17 if log_uses_new_scheme_id?
-    return field_16 if log_uses_old_scheme_id?
+
+    field_16 if log_uses_old_scheme_id?
   end
 
   def scheme_or_management_group
@@ -1424,7 +1428,8 @@ private
   ].each do |hash|
     define_method("age#{hash[:person]}_known?") do
       return 1 if public_send(hash[:field]) == "R"
-      return 0 if send("person_#{hash[:person]}_present?")
+
+      0 if send("person_#{hash[:person]}_present?")
     end
   end
 
@@ -1488,7 +1493,8 @@ private
 
   def housingneeds_other
     return 1 if field_86 == 1
-    return 0 if [field_83, field_84, field_85].include?(1)
+
+    0 if [field_83, field_84, field_85].include?(1)
   end
 
   def prevloc
@@ -1555,7 +1561,7 @@ private
   end
 
   def earnings
-    field_122.round if field_122.present?
+    field_122.presence&.round
   end
 
   def tshortfall_known
diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb
index 66d46ead5..1ba683f66 100644
--- a/app/services/bulk_upload/lettings/year2024/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb
@@ -562,7 +562,7 @@ class BulkUpload::Lettings::Year2024::RowParser
 private
 
   def validate_valid_radio_option
-    log.attributes.each do |question_id, _v|
+    log.attributes.each_key do |question_id|
       question = log.form.get_question(question_id, log)
 
       next unless question&.type == "radio"
@@ -1455,7 +1455,8 @@ private
   ].each do |hash|
     define_method("age#{hash[:person]}_known?") do
       return 1 if public_send(hash[:field]) == "R"
-      return 0 if send("person_#{hash[:person]}_present?")
+
+      0 if send("person_#{hash[:person]}_present?")
     end
   end
 
@@ -1519,7 +1520,8 @@ private
 
   def housingneeds_other
     return 1 if field_82 == 1
-    return 0 if [field_79, field_80, field_81].include?(1)
+
+    0 if [field_79, field_80, field_81].include?(1)
   end
 
   def prevloc
@@ -1595,7 +1597,7 @@ private
   end
 
   def earnings
-    field_119.round if field_119.present?
+    field_119.presence&.round
   end
 
   def tshortfall_known
diff --git a/app/services/bulk_upload/lettings/year2025/row_parser.rb b/app/services/bulk_upload/lettings/year2025/row_parser.rb
index 0745056d2..9887c42be 100644
--- a/app/services/bulk_upload/lettings/year2025/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2025/row_parser.rb
@@ -561,7 +561,7 @@ class BulkUpload::Lettings::Year2025::RowParser
 private
 
   def validate_valid_radio_option
-    log.attributes.each do |question_id, _v|
+    log.attributes.each_key do |question_id|
       question = log.form.get_question(question_id, log)
 
       next unless question&.type == "radio"
@@ -1452,7 +1452,8 @@ private
   ].each do |hash|
     define_method("age#{hash[:person]}_known?") do
       return 1 if public_send(hash[:field]) == "R"
-      return 0 if send("person_#{hash[:person]}_present?")
+
+      0 if send("person_#{hash[:person]}_present?")
     end
   end
 
@@ -1516,7 +1517,8 @@ private
 
   def housingneeds_other
     return 1 if field_82 == 1
-    return 0 if [field_79, field_80, field_81].include?(1)
+
+    0 if [field_79, field_80, field_81].include?(1)
   end
 
   def prevloc
@@ -1592,7 +1594,7 @@ private
   end
 
   def earnings
-    field_119.round if field_119.present?
+    field_119.presence&.round
   end
 
   def tshortfall_known
diff --git a/app/services/bulk_upload/lettings/year2026/row_parser.rb b/app/services/bulk_upload/lettings/year2026/row_parser.rb
index 8c25ac2ed..547ced717 100644
--- a/app/services/bulk_upload/lettings/year2026/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2026/row_parser.rb
@@ -600,7 +600,7 @@ class BulkUpload::Lettings::Year2026::RowParser
 private
 
   def validate_valid_radio_option
-    log.attributes.each do |question_id, _v|
+    log.attributes.each_key do |question_id|
       question = log.form.get_question(question_id, log)
 
       next unless question&.type == "radio"
@@ -1566,7 +1566,8 @@ private
   ].each do |hash|
     define_method("age#{hash[:person]}_known?") do
       return 1 if public_send(hash[:field]) == "R"
-      return 0 if send("person_#{hash[:person]}_present?")
+
+      0 if send("person_#{hash[:person]}_present?")
     end
   end
 
@@ -1630,7 +1631,8 @@ private
 
   def housingneeds_other
     return 1 if field_97 == 1
-    return 0 if [field_94, field_95, field_96].include?(1)
+
+    0 if [field_94, field_95, field_96].include?(1)
   end
 
   def prevloc
@@ -1706,7 +1708,7 @@ private
   end
 
   def earnings
-    field_137.round if field_137.present?
+    field_137.presence&.round
   end
 
   def tshortfall_known
diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb
index ddcf18b6a..75f964e7c 100644
--- a/app/services/bulk_upload/sales/year2023/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2023/row_parser.rb
@@ -915,7 +915,7 @@ private
     attributes["mortlen"] = mortlen
 
     attributes["proplen"] = proplen if proplen&.positive?
-    attributes["proplen_asked"] = attributes["proplen"]&.present? ? 0 : 1
+    attributes["proplen_asked"] = attributes["proplen"].present? ? 0 : 1
     attributes["jointmore"] = field_15
     attributes["staircase"] = field_87
     attributes["privacynotice"] = field_29
@@ -992,7 +992,8 @@ private
   ].each do |hash|
     define_method("age#{hash[:person]}_known?") do
       return 1 if public_send(hash[:field]) == "R"
-      return 0 if send("person_#{hash[:person]}_present?")
+
+      0 if send("person_#{hash[:person]}_present?")
     end
   end
 
@@ -1050,72 +1051,84 @@ private
   def sale_type
     return field_8 if shared_ownership?
     return field_9 if discounted_ownership?
-    return field_10 if outright_sale?
+
+    field_10 if outright_sale?
   end
 
   def value
     return field_103 if shared_ownership?
     return field_116 if discounted_ownership?
-    return field_127 if outright_sale?
+
+    field_127 if outright_sale?
   end
 
   def mortgage
     return field_106 if shared_ownership?
     return field_120 if discounted_ownership?
-    return field_129 if outright_sale?
+
+    field_129 if outright_sale?
   end
 
   def extrabor
     return field_110 if shared_ownership?
     return field_124 if discounted_ownership?
-    return field_133 if outright_sale?
+
+    field_133 if outright_sale?
   end
 
   def deposit
     return field_111 if shared_ownership?
     return field_125 if discounted_ownership?
-    return field_134 if outright_sale?
+
+    field_134 if outright_sale?
   end
 
   def mscharge
     return field_114 if shared_ownership?
     return field_126 if discounted_ownership?
-    return field_135 if outright_sale?
+
+    field_135 if outright_sale?
   end
 
   def mortgagelender
     return field_107 if shared_ownership?
     return field_121 if discounted_ownership?
-    return field_130 if outright_sale?
+
+    field_130 if outright_sale?
   end
 
   def mortgagelenderother
     return field_108 if shared_ownership?
     return field_122 if discounted_ownership?
-    return field_131 if outright_sale?
+
+    field_131 if outright_sale?
   end
 
   def mortlen
     return field_109 if shared_ownership?
     return field_123 if discounted_ownership?
-    return field_132 if outright_sale?
+
+    field_132 if outright_sale?
   end
 
   def proplen
     return field_86 if shared_ownership?
-    return field_115 if discounted_ownership?
+
+    field_115 if discounted_ownership?
   end
 
   def mortgageused
     return field_105 if shared_ownership?
     return field_119 if discounted_ownership?
-    return field_128 if outright_sale?
+
+    field_128 if outright_sale?
   end
 
   def mortgageused_field
     return :field_105 if shared_ownership?
     return :field_119 if discounted_ownership?
-    return :field_128 if outright_sale?
+
+    :field_128 if outright_sale?
   end
 
   def owning_organisation
@@ -1263,7 +1276,7 @@ private
   end
 
   def validate_valid_radio_option
-    log.attributes.each do |question_id, _v|
+    log.attributes.each_key do |question_id|
       question = log.form.get_question(question_id, log)
 
       next if question_id == "type"
diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb
index a1b214182..879bdbb3f 100644
--- a/app/services/bulk_upload/sales/year2024/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2024/row_parser.rb
@@ -938,7 +938,7 @@ private
     attributes["mortlen"] = mortlen
 
     attributes["proplen"] = proplen if proplen&.positive?
-    attributes["proplen_asked"] = attributes["proplen"]&.present? ? 0 : 1
+    attributes["proplen_asked"] = attributes["proplen"].present? ? 0 : 1
     attributes["jointmore"] = field_16
     attributes["staircase"] = field_86
     attributes["privacynotice"] = field_18
@@ -1026,7 +1026,8 @@ private
   ].each do |hash|
     define_method("age#{hash[:person]}_known?") do
       return 1 if public_send(hash[:field]) == "R"
-      return 0 if send("person_#{hash[:person]}_present?")
+
+      0 if send("person_#{hash[:person]}_present?")
     end
   end
 
@@ -1084,64 +1085,75 @@ private
   def sale_type
     return field_9 if shared_ownership?
     return field_10 if discounted_ownership?
-    return field_11 if outright_sale?
+
+    field_11 if outright_sale?
   end
 
   def value
     return field_101 if shared_ownership?
     return field_114 if discounted_ownership?
-    return field_125 if outright_sale?
+
+    field_125 if outright_sale?
   end
 
   def mortgage
     return field_104 if shared_ownership?
     return field_118 if discounted_ownership?
-    return field_127 if outright_sale?
+
+    field_127 if outright_sale?
   end
 
   def extrabor
     return field_108 if shared_ownership?
     return field_122 if discounted_ownership?
-    return field_129 if outright_sale?
+
+    field_129 if outright_sale?
   end
 
   def deposit
     return field_109 if shared_ownership?
     return field_123 if discounted_ownership?
-    return field_130 if outright_sale?
+
+    field_130 if outright_sale?
   end
 
   def mscharge
     return field_112 if shared_ownership?
     return field_124 if discounted_ownership?
-    return field_131 if outright_sale?
+
+    field_131 if outright_sale?
   end
 
   def mortgagelender
     return field_105 if shared_ownership?
-    return field_119 if discounted_ownership?
+
+    field_119 if discounted_ownership?
   end
 
   def mortgagelenderother
     return field_106 if shared_ownership?
-    return field_120 if discounted_ownership?
+
+    field_120 if discounted_ownership?
   end
 
   def mortlen
     return field_107 if shared_ownership?
     return field_121 if discounted_ownership?
-    return field_128 if outright_sale?
+
+    field_128 if outright_sale?
   end
 
   def proplen
     return field_85 if shared_ownership?
-    return field_113 if discounted_ownership?
+
+    field_113 if discounted_ownership?
   end
 
   def mortgageused
     return field_103 if shared_ownership?
     return field_117 if discounted_ownership?
-    return field_126 if outright_sale?
+
+    field_126 if outright_sale?
   end
 
   def value_fields
@@ -1393,7 +1405,7 @@ private
   end
 
   def validate_valid_radio_option
-    log.attributes.each do |question_id, _v|
+    log.attributes.each_key do |question_id|
       question = log.form.get_question(question_id, log)
 
       next if question_id == "type"
diff --git a/app/services/bulk_upload/sales/year2025/row_parser.rb b/app/services/bulk_upload/sales/year2025/row_parser.rb
index a78b9fe5d..19094f6c6 100644
--- a/app/services/bulk_upload/sales/year2025/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2025/row_parser.rb
@@ -906,7 +906,7 @@ private
     attributes["mortlen"] = mortlen
 
     attributes["proplen"] = proplen if proplen&.positive?
-    attributes["proplen_asked"] = attributes["proplen"]&.present? ? 0 : 1
+    attributes["proplen_asked"] = attributes["proplen"].present? ? 0 : 1
     attributes["jointmore"] = field_13
     attributes["staircase"] = field_10
     attributes["privacynotice"] = field_15
@@ -1008,7 +1008,8 @@ private
   ].each do |hash|
     define_method("age#{hash[:person]}_known?") do
       return 1 if public_send(hash[:field]) == "R"
-      return 0 if send("person_#{hash[:person]}_present?")
+
+      0 if send("person_#{hash[:person]}_present?")
     end
   end
 
@@ -1076,58 +1077,68 @@ private
 
   def sale_type
     return field_9 if shared_ownership?
-    return field_11 if discounted_ownership?
+
+    field_11 if discounted_ownership?
   end
 
   def value
     return field_86 if shared_ownership_initial_purchase?
     return field_113 if discounted_ownership?
-    return field_107 if staircasing?
+
+    field_107 if staircasing?
   end
 
   def equity
     return field_87 if shared_ownership_initial_purchase?
-    return field_108 if staircasing?
+
+    field_108 if staircasing?
   end
 
   def mortgage
     return field_89 if shared_ownership?
-    return field_117 if discounted_ownership?
+
+    field_117 if discounted_ownership?
   end
 
   def extrabor
-    return field_119 if discounted_ownership?
+    field_119 if discounted_ownership?
   end
 
   def deposit
     return field_91 if shared_ownership?
-    return field_120 if discounted_ownership?
+
+    field_120 if discounted_ownership?
   end
 
   def mrent
     return field_93 if shared_ownership_initial_purchase?
-    return field_111 if staircasing?
+
+    field_111 if staircasing?
   end
 
   def mscharge
     return field_94 if shared_ownership?
-    return field_121 if discounted_ownership?
+
+    field_121 if discounted_ownership?
   end
 
   def mortlen
     return field_90 if shared_ownership?
-    return field_118 if discounted_ownership?
+
+    field_118 if discounted_ownership?
   end
 
   def proplen
     return field_79 if shared_ownership?
-    return field_112 if discounted_ownership?
+
+    field_112 if discounted_ownership?
   end
 
   def mortgageused
     return field_88 if shared_ownership_initial_purchase?
     return field_116 if discounted_ownership?
-    return field_109 if staircasing?
+
+    field_109 if staircasing?
   end
 
   def value_fields
@@ -1369,7 +1380,7 @@ private
   end
 
   def validate_valid_radio_option
-    log.attributes.each do |question_id, _v|
+    log.attributes.each_key do |question_id|
       question = log.form.get_question(question_id, log)
 
       next if question_id == "type"
diff --git a/app/services/bulk_upload/sales/year2026/row_parser.rb b/app/services/bulk_upload/sales/year2026/row_parser.rb
index adb7cc6a2..08d56fe37 100644
--- a/app/services/bulk_upload/sales/year2026/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2026/row_parser.rb
@@ -934,7 +934,7 @@ private
     attributes["mortlen"] = mortlen
 
     attributes["proplen"] = proplen if proplen&.positive?
-    attributes["proplen_asked"] = attributes["proplen"]&.present? ? 0 : 1
+    attributes["proplen_asked"] = attributes["proplen"].present? ? 0 : 1
     attributes["jointmore"] = field_13
     attributes["staircase"] = field_10
     attributes["privacynotice"] = field_15
@@ -1036,7 +1036,8 @@ private
   ].each do |hash|
     define_method("age#{hash[:person]}_known?") do
       return 1 if public_send(hash[:field]) == "R"
-      return 0 if send("person_#{hash[:person]}_present?")
+
+      0 if send("person_#{hash[:person]}_present?")
     end
   end
 
@@ -1104,58 +1105,68 @@ private
 
   def sale_type
     return field_9 if shared_ownership?
-    return field_11 if discounted_ownership?
+
+    field_11 if discounted_ownership?
   end
 
   def value
     return field_86 if shared_ownership_initial_purchase?
     return field_113 if discounted_ownership?
-    return field_107 if staircasing?
+
+    field_107 if staircasing?
   end
 
   def equity
     return field_87 if shared_ownership_initial_purchase?
-    return field_108 if staircasing?
+
+    field_108 if staircasing?
   end
 
   def mortgage
     return field_89 if shared_ownership?
-    return field_117 if discounted_ownership?
+
+    field_117 if discounted_ownership?
   end
 
   def extrabor
-    return field_119 if discounted_ownership?
+    field_119 if discounted_ownership?
   end
 
   def deposit
     return field_91 if shared_ownership?
-    return field_120 if discounted_ownership?
+
+    field_120 if discounted_ownership?
   end
 
   def mrent
     return field_93 if shared_ownership_initial_purchase?
-    return field_111 if staircasing?
+
+    field_111 if staircasing?
   end
 
   def mscharge
     return field_94 if shared_ownership?
-    return field_121 if discounted_ownership?
+
+    field_121 if discounted_ownership?
   end
 
   def mortlen
     return field_90 if shared_ownership?
-    return field_118 if discounted_ownership?
+
+    field_118 if discounted_ownership?
   end
 
   def proplen
     return field_79 if shared_ownership?
-    return field_112 if discounted_ownership?
+
+    field_112 if discounted_ownership?
   end
 
   def mortgageused
     return field_88 if shared_ownership_initial_purchase?
     return field_116 if discounted_ownership?
-    return field_109 if staircasing?
+
+    field_109 if staircasing?
   end
 
   def value_fields
@@ -1398,7 +1409,7 @@ private
   end
 
   def validate_valid_radio_option
-    log.attributes.each do |question_id, _v|
+    log.attributes.each_key do |question_id|
       question = log.form.get_question(question_id, log)
 
       next if question_id == "type"
diff --git a/app/services/csv/lettings_log_csv_service.rb b/app/services/csv/lettings_log_csv_service.rb
index 003515ac9..dd3be8595 100644
--- a/app/services/csv/lettings_log_csv_service.rb
+++ b/app/services/csv/lettings_log_csv_service.rb
@@ -398,12 +398,14 @@ module Csv
 
     def label_if_boolean_value(value)
       return "Yes" if value == true
-      return "No" if value == false
+
+      "No" if value == false
     end
 
     def conventional_yes_no_label(value)
       return "Yes" if value == 1
-      return "No" if value&.zero?
+
+      "No" if value&.zero?
     end
   end
 end
diff --git a/app/services/csv/sales_log_csv_service.rb b/app/services/csv/sales_log_csv_service.rb
index ed16653f1..07ccad82c 100644
--- a/app/services/csv/sales_log_csv_service.rb
+++ b/app/services/csv/sales_log_csv_service.rb
@@ -408,7 +408,8 @@ module Csv
 
     def label_if_boolean_value(value)
       return "Yes" if value == true
-      return "No" if value == false
+
+      "No" if value == false
     end
   end
 end
diff --git a/app/services/documentation_generator.rb b/app/services/documentation_generator.rb
index c2005f320..58c2031f7 100644
--- a/app/services/documentation_generator.rb
+++ b/app/services/documentation_generator.rb
@@ -93,7 +93,7 @@ class DocumentationGenerator
 
     interruption_screen_pages = form.pages.select { |page| page.questions.first.type == "interruption_screen" }
     interruption_screen_pages_grouped_by_question = interruption_screen_pages.group_by { |page| page.questions.first.id }
-    interruption_screen_pages_grouped_by_question.each do |_question_id, pages|
+    interruption_screen_pages_grouped_by_question.each_value do |pages|
       pages.map do |page|
         save_soft_validation(form, page, validation_descriptions, log_type)
       end
diff --git a/app/services/exports/organisation_export_constants.rb b/app/services/exports/organisation_export_constants.rb
index 6c78a55db..7ffbfd223 100644
--- a/app/services/exports/organisation_export_constants.rb
+++ b/app/services/exports/organisation_export_constants.rb
@@ -23,6 +23,6 @@ module Exports::OrganisationExportConstants
    "dpo_email",
    "profit_status",
    "group",
-   "status"
+   "status",
   ]
 end
diff --git a/app/services/filter_manager.rb b/app/services/filter_manager.rb
index 7757ad39e..69e895809 100644
--- a/app/services/filter_manager.rb
+++ b/app/services/filter_manager.rb
@@ -121,7 +121,7 @@ class FilterManager
 
       new_filters = new_filters.except("user") if params["assigned_to"] == "all"
       new_filters["user"] = current_user.id.to_s if params["assigned_to"] == "you"
-      new_filters = new_filters.except("user_text_search") if params["assigned_to"] == "all" || params["assigned_to"] == "you"
+      new_filters = new_filters.except("user_text_search") if %w[all you].include?(params["assigned_to"])
       new_filters = new_filters.except("owning_organisation_text_search") if params["owning_organisation_select"] == "all"
       new_filters = new_filters.except("managing_organisation_text_search") if params["managing_organisation_select"] == "all"
     end
diff --git a/app/views/form/_checkbox_question.html.erb b/app/views/form/_checkbox_question.html.erb
index b4feb12bd..d3c52c270 100644
--- a/app/views/form/_checkbox_question.html.erb
+++ b/app/views/form/_checkbox_question.html.erb
@@ -16,7 +16,7 @@
           hint: { text: option["hint"] },
           checked: @log[key] == 1,
           exclusive: after_divider,
-          link_errors: index.zero? ? true : nil,
+          link_errors: index.zero? || nil,
           **stimulus_html_attributes(question) %>
       <% end %>
     <% end %>
diff --git a/app/views/form/_interruption_screen_question.html.erb b/app/views/form/_interruption_screen_question.html.erb
index c0063e477..9aa38ca5d 100644
--- a/app/views/form/_interruption_screen_question.html.erb
+++ b/app/views/form/_interruption_screen_question.html.erb
@@ -18,7 +18,7 @@
 <div class="govuk-button-group">
   <%= f.govuk_submit "Confirm and continue" %>
   <%= govuk_link_to(
-    (@page.skip_text || "Skip for now"),
-    (@page.skip_href(@log) || send(@log.form.next_page_redirect_path(@page, @log, current_user, ignore_answered: true), @log)),
+    @page.skip_text || "Skip for now",
+    @page.skip_href(@log) || send(@log.form.next_page_redirect_path(@page, @log, current_user, ignore_answered: true), @log),
   ) %>
 </div>
diff --git a/app/views/form/_radio_question.html.erb b/app/views/form/_radio_question.html.erb
index bf6abb0d0..e810d7b7a 100644
--- a/app/views/form/_radio_question.html.erb
+++ b/app/views/form/_radio_question.html.erb
@@ -28,14 +28,14 @@
           key,
           label: { text: options["value"] },
           hint: { text: options["hint"] },
-          link_errors: index.zero? ? true : nil,
+          link_errors: index.zero? || nil,
           **stimulus_html_attributes(question) %>
       <% else %>
         <%= f.govuk_radio_button question.id.to_sym,
           key,
           label: { text: options["value"] },
           hint: { text: options["hint"] },
-          link_errors: index.zero? ? true : nil,
+          link_errors: index.zero? || nil,
           **stimulus_html_attributes(question) do %>
             <%= render partial: "#{conditional_question.type}_question", locals: {
               question: conditional_question,
diff --git a/app/views/rails_admin/main/_submit_buttons.html.erb b/app/views/rails_admin/main/_submit_buttons.html.erb
index 241624c4e..1768ce2b3 100644
--- a/app/views/rails_admin/main/_submit_buttons.html.erb
+++ b/app/views/rails_admin/main/_submit_buttons.html.erb
@@ -1,6 +1,6 @@
 <div class="form-actions row justify-content-end my-3">
   <div class="col-sm-10">
-    <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>">
+    <input name="return_to" type="<%= :hidden %>" value="<%= params[:return_to].presence || request.referer %>">
     <button class="govuk-button" data-disable-with="<%= t("admin.form.save") %>" name="_save" type="submit"<%= " disabled" unless @action.enabled? %>>
       <i class="fas fa-check"></i>
       <%= t("admin.form.save") %>
diff --git a/app/views/rails_admin/main/dashboard.html.erb b/app/views/rails_admin/main/dashboard.html.erb
index 52ab47de5..8bbaa2f42 100644
--- a/app/views/rails_admin/main/dashboard.html.erb
+++ b/app/views/rails_admin/main/dashboard.html.erb
@@ -40,7 +40,7 @@
                              -1
                            end %>
               <div class="<%= active ? "active progress-bar-striped " : "" %>progress" style="margin-bottom:0px">
-                <div class="bg-<%= get_indicator(percent) %> progress-bar animate-width-to" data-animate-length="<%= ([1.0, percent].max.to_i * 20) %>" data-animate-width-to="<%= [2.0, percent].max.to_i %>%" style="width:2%">
+                <div class="bg-<%= get_indicator(percent) %> progress-bar animate-width-to" data-animate-length="<%= [1.0, percent].max.to_i * 20 %>" data-animate-width-to="<%= [2.0, percent].max.to_i %>%" style="width:2%">
                   <%= @count[abstract_model.model.name] %>
                 </div>
               </div>
diff --git a/app/views/rails_admin/main/delete.html.erb b/app/views/rails_admin/main/delete.html.erb
index 59a01a377..5839208e2 100644
--- a/app/views/rails_admin/main/delete.html.erb
+++ b/app/views/rails_admin/main/delete.html.erb
@@ -7,7 +7,7 @@
   <%= render partial: "delete_notice", object: @object %>
 </ul>
 <%= form_for(@object, url: delete_path(model_name: @abstract_model.to_param, id: @object.id), html: { method: "delete" }) do %>
-  <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>">
+  <input name="return_to" type="<%= :hidden %>" value="<%= params[:return_to].presence || request.referer %>">
   <div class="form-actions">
     <button class="govuk-button govuk-button--warning" data-disable-with="<%= t("admin.form.confirmation") %>" type="submit">
       <i class="fas fa-check"></i>
diff --git a/config/initializers/multi_logger.rb b/config/initializers/multi_logger.rb
index 6c0b4eb27..d640a2854 100644
--- a/config/initializers/multi_logger.rb
+++ b/config/initializers/multi_logger.rb
@@ -4,13 +4,9 @@ class MultiLogger
     @file_logger = file_logger
   end
 
-  def info(data)
-    @rails_logger.info(data)
-  end
+  delegate :info, to: :@rails_logger
 
-  def warn(data)
-    @rails_logger.warn(data)
-  end
+  delegate :warn, to: :@rails_logger
 
   def error(data)
     @rails_logger.error(data)
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index d2a9f64e3..2524dd1b7 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -32,7 +32,9 @@ Redis.silence_deprecations = true
 
 Sidekiq.configure_server do |config|
   config.on(:startup) do
+    # rubocop:disable Rails/FindEach
     Sidekiq::Cron::Job.all.each(&:destroy)
+    # rubocop:enable Rails/FindEach
     unless FeatureToggle.service_moved? || FeatureToggle.service_unavailable?
       Sidekiq::Cron::Job.load_from_hash YAML.load_file("config/sidekiq_cron_schedule.yml")
     end
diff --git a/config/locales/forms/2026/lettings/soft_validations.en.yml b/config/locales/forms/2026/lettings/soft_validations.en.yml
index 74e7af46f..88bcaf1ea 100644
--- a/config/locales/forms/2026/lettings/soft_validations.en.yml
+++ b/config/locales/forms/2026/lettings/soft_validations.en.yml
@@ -57,6 +57,23 @@ en:
             title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}."
             informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question."
 
+          tenancyother_value_check:
+            page_header: ""
+            check_answer_label: "Tenancy other confirmation"
+            check_answer_prompt: "Confirm tenancy type"
+            hint_text: ""
+            question_text: ""
+            title_text: "You told us that the type of tenancy was %{tenancyother}."
+            informative_text: "We already know whether the tenancy is introductory or has a starter period from your previous answer. Your answer to the type of main tenancy question should be the type of tenancy that the tenant will roll onto after any introductory or starter period. Choose from the categories or write a description if no category is suitable."
+          referral_value_check:
+            page_header: ""
+            check_answer_label: "Referral confirmation"
+            check_answer_prompt: "Confirm referral type"
+            hint_text: ""
+            question_text: "Are you sure?"
+            title_text: "Are you sure?"
+            informative_text: "This is a general needs log, and this referral type is for supported housing."
+
           net_income_value_check:
             page_header: ""
             check_answer_label: "Net income confirmation"
diff --git a/config/routes.rb b/config/routes.rb
index a9ea0da42..942f3e0bb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -301,7 +301,7 @@ Rails.application.routes.draw do
       get "review", to: "form#review"
     end
 
-    FormHandler.instance.lettings_forms.each do |_key, form|
+    FormHandler.instance.lettings_forms.each_value do |form|
       form.pages.map do |page|
         get page.id.to_s.dasherize, to: "form#show_page"
         post page.id.to_s.dasherize, to: "form#submit_form"
@@ -377,7 +377,7 @@ Rails.application.routes.draw do
       get "review", to: "form#review"
     end
 
-    FormHandler.instance.sales_forms.each do |_key, form|
+    FormHandler.instance.sales_forms.each_value do |form|
       form.pages.map do |page|
         get page.id.to_s.dasherize, to: "form#show_page"
         post page.id.to_s.dasherize, to: "form#submit_form"
diff --git a/db/migrate/20241206142943_create_active_storage_variant_records.active_storage.rb b/db/migrate/20241206142943_create_active_storage_variant_records.active_storage.rb
index 78b8564cf..e7b22e562 100644
--- a/db/migrate/20241206142943_create_active_storage_variant_records.active_storage.rb
+++ b/db/migrate/20241206142943_create_active_storage_variant_records.active_storage.rb
@@ -4,7 +4,7 @@ class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
     return unless table_exists?(:active_storage_blobs)
 
     # Use Active Record's configured type for primary key
-    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t| # rubocop:disable Rails/CreateTableWithTimestamps
+    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
       t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
       t.string :variation_digest, null: false
 
diff --git a/db/migrate/20260212091506_add_tenancyother_value_check_to_lettings_logs.rb b/db/migrate/20260212091506_add_tenancyother_value_check_to_lettings_logs.rb
new file mode 100644
index 000000000..339dc7a07
--- /dev/null
+++ b/db/migrate/20260212091506_add_tenancyother_value_check_to_lettings_logs.rb
@@ -0,0 +1,5 @@
+class AddTenancyotherValueCheckToLettingsLogs < ActiveRecord::Migration[7.0]
+  def change
+    add_column :lettings_logs, :tenancyother_value_check, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 19faeed2a..62d32713f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2026_02_04_100051) do
+ActiveRecord::Schema[7.2].define(version: 2026_02_12_091506) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -403,6 +403,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_02_04_100051) do
     t.integer "referral_register"
     t.integer "referral_noms"
     t.integer "referral_org"
+    t.integer "tenancyother_value_check"
     t.index ["assigned_to_id"], name: "index_lettings_logs_on_assigned_to_id"
     t.index ["bulk_upload_id"], name: "index_lettings_logs_on_bulk_upload_id"
     t.index ["created_by_id"], name: "index_lettings_logs_on_created_by_id"
diff --git a/docs/setup.md b/docs/setup.md
index f022797ec..8bf9c635f 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -70,8 +70,8 @@ We recommend using [nvm](https://github.com/nvm-sh/nvm) to manage NodeJS version
 4. Install Ruby and Bundler
 
    ```bash
-   rbenv install 3.1.6
-   rbenv global 3.1.6
+   rbenv install 3.4.4
+   rbenv global 3.4.4
    source ~/.bashrc
    gem install bundler
    ```
diff --git a/lib/tasks/add_new_year_to_questions.rake b/lib/tasks/add_new_year_to_questions.rake
new file mode 100644
index 000000000..bd5a75cd3
--- /dev/null
+++ b/lib/tasks/add_new_year_to_questions.rake
@@ -0,0 +1,54 @@
+require "pathname"
+
+desc "Add a new year to all lettings question number hashes and saves the new code.
+Usage: bundle exec rake add_new_year_to_questions[new_year,log_type].
+Example: bundle exec rake add_new_year_to_questions[2027,lettings].
+This rake should only be run as part of local development at the start of new collection year creation.
+Make sure your working tree is clean before running this, it will update each question file in place.
+Note that this will only update questions with a QUESTION_NUMBER_FROM_YEAR hash set.
+Some questions (such as any of the per person questions) which define custom question logic will need manual review.
+Params:
+- new_year: the year to add, e.g. 2025
+- log_type: the type of log to update. can be lettings or sales"
+task :add_new_year_to_questions, %i[new_year log_type] => :environment do |_task, args|
+  new_year = args[:new_year].to_i
+  previous_year = new_year - 1
+
+  root = Pathname.new("app/models/form/#{args[:log_type]}/questions")
+  files = root.glob("*.rb")
+
+  hash_re = /QUESTION_NUMBER_FROM_YEAR\s*=\s*\{([^}]*)}\.freeze/m
+
+  changed = []
+
+  files.each do |path|
+    text = path.read
+    next unless text.include?("QUESTION_NUMBER_FROM_YEAR")
+
+    match = hash_re.match(text)
+    next unless match
+
+    body = match[1]
+    pairs = body.scan(/(\d+)\s*=>\s*(\d+)/)
+    next if pairs.empty?
+
+    year_to_num = pairs.to_h { |y, n| [y.to_i, n.to_i] }
+    next if year_to_num.key?(new_year)
+    next unless year_to_num.key?(previous_year)
+
+    year_to_num[new_year] = year_to_num[previous_year]
+
+    items = year_to_num.keys.sort.map { |y| "#{y} => #{year_to_num[y]}" }.join(", ")
+    replacement = "QUESTION_NUMBER_FROM_YEAR = { #{items} }.freeze"
+
+    new_text = text.sub(hash_re, replacement)
+
+    next if new_text == text
+
+    path.write(new_text)
+    changed << path
+  end
+
+  puts "changed #{changed.length}"
+  changed.each { |p| puts p }
+end
diff --git a/lib/tasks/generate_lettings_documentation.rake b/lib/tasks/generate_lettings_documentation.rake
index 5c2ff6f20..4d4239e31 100644
--- a/lib/tasks/generate_lettings_documentation.rake
+++ b/lib/tasks/generate_lettings_documentation.rake
@@ -50,7 +50,7 @@ namespace :generate_lettings_documentation do
 
     all_validation_methods = row_parser_class.private_instance_methods.select { |method| method.starts_with?("validate_") }
 
-    all_helper_methods = row_parser_class.private_instance_methods(false) +  row_parser_class.instance_methods(false) - all_validation_methods
+    all_helper_methods = row_parser_class.private_instance_methods(false) + row_parser_class.instance_methods(false) - all_validation_methods
 
     field_mapping_for_errors = row_parser_class.new.send("field_mapping_for_errors")
     DocumentationGenerator.new.describe_bu_validations(client, form, row_parser_class, all_validation_methods, all_helper_methods, field_mapping_for_errors, "lettings")
diff --git a/lib/tasks/generate_sales_documentation.rake b/lib/tasks/generate_sales_documentation.rake
index 4a7ff7568..e7f338b42 100644
--- a/lib/tasks/generate_sales_documentation.rake
+++ b/lib/tasks/generate_sales_documentation.rake
@@ -47,7 +47,7 @@ namespace :generate_sales_documentation do
     row_parser_class = "BulkUpload::Sales::Year#{form_year}::RowParser".constantize
     client = OpenAI::Client.new(access_token: ENV["OPENAI_API_KEY"])
     all_validation_methods = row_parser_class.private_instance_methods.select { |method| method.starts_with?("validate_") }
-    all_helper_methods = row_parser_class.private_instance_methods(false) +  row_parser_class.instance_methods(false) - all_validation_methods
+    all_helper_methods = row_parser_class.private_instance_methods(false) + row_parser_class.instance_methods(false) - all_validation_methods
     field_mapping_for_errors = row_parser_class.new.send("field_mapping_for_errors")
 
     DocumentationGenerator.new.describe_bu_validations(client, form, row_parser_class, all_validation_methods, all_helper_methods, field_mapping_for_errors, "sales")
diff --git a/lib/tasks/handle_unpended_logs.rake b/lib/tasks/handle_unpended_logs.rake
index d3837ee06..dcc87d117 100644
--- a/lib/tasks/handle_unpended_logs.rake
+++ b/lib/tasks/handle_unpended_logs.rake
@@ -62,13 +62,13 @@ task :handle_unpended_logs, %i[perform_updates] => :environment do |_task, args|
       visible_duplicates = duplicates.where(status: %w[in_progress completed])
       deleted_duplicates = duplicates.where(status: %w[deleted])
 
-      if visible_duplicates.length.zero? && deleted_duplicates.any? { |dup| dup.discarded_at > result["created_at"] }
+      if visible_duplicates.empty? && deleted_duplicates.any? { |dup| dup.discarded_at > result["created_at"] }
         seen.add(id)
         csv << [id, log.collection_start_year, log.status, log.owning_organisation_name, log.assigned_to_id, log.assigned_to.email, "Leave", "Log has no visible duplicates and at least one duplicate has been deleted since being affected"]
         next
       end
 
-      if visible_duplicates.length.zero?
+      if visible_duplicates.empty?
         seen.add(id)
         csv << [id, log.collection_start_year, log.status, log.owning_organisation_name, log.assigned_to_id, log.assigned_to.email, "Leave", "Log has no visible duplicates"]
         next
diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake
index 125a5b30e..5ace4b11d 100644
--- a/lib/tasks/lint.rake
+++ b/lib/tasks/lint.rake
@@ -5,7 +5,7 @@ end
 
 desc "Run ERB Lint"
 task erblint: :environment do
-  sh "bundle exec erblint --lint-all"
+  sh "bundle exec erb_lint --lint-all"
 end
 
 desc "Run Standard"
diff --git a/lib/tasks/set_log_validation_collection_year.rake b/lib/tasks/set_log_validation_collection_year.rake
index 9468d2b0f..eadd052e4 100644
--- a/lib/tasks/set_log_validation_collection_year.rake
+++ b/lib/tasks/set_log_validation_collection_year.rake
@@ -1,6 +1,6 @@
 desc "Sets value for collection_year log validations depending on the from value"
 task set_log_validation_collection_year: :environment do
-  LogValidation.all.each do |log_validation|
+  LogValidation.all.find_each do |log_validation|
     log_validation.update(collection_year: "#{log_validation.from.year}/#{log_validation.from.year + 1}")
   end
 end
diff --git a/spec/components/bulk_upload_error_row_component_spec.rb b/spec/components/bulk_upload_error_row_component_spec.rb
index 2576e7801..192e38c3c 100644
--- a/spec/components/bulk_upload_error_row_component_spec.rb
+++ b/spec/components/bulk_upload_error_row_component_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe BulkUploadErrorRowComponent, type: :component do
     end
 
     context "when the bulk upload is for 2024" do
-      context "with  a lettings bulk upload" do
+      context "with a lettings bulk upload" do
         let(:bulk_upload) { build(:bulk_upload, :lettings, year: 2024) }
         let(:field) { :field_130 }
 
diff --git a/spec/components/check_answers_summary_list_card_component_spec.rb b/spec/components/check_answers_summary_list_card_component_spec.rb
index 2909e9122..2f263ef2f 100644
--- a/spec/components/check_answers_summary_list_card_component_spec.rb
+++ b/spec/components/check_answers_summary_list_card_component_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe CheckAnswersSummaryListCardComponent, type: :component do
   end
 
   it "applicable questions doesn't return questions that are hidden in check answers" do
-    expect(component.applicable_questions.map(&:id).include?("retirement_value_check")).to eq(false)
+    expect(component.applicable_questions.map(&:id).include?("retirement_value_check")).to be(false)
   end
 
   it "has the correct answer label for a question" do
@@ -45,7 +45,7 @@ RSpec.describe CheckAnswersSummaryListCardComponent, type: :component do
   context "when log was not created via a bulk upload and has an unanswered question" do
     let(:log) { create(:lettings_log, :in_progress) }
 
-    it "displays normal copy with muted colour " do
+    it "displays normal copy with muted colour" do
       expect(rendered).to have_link(log.form.get_question("sex1", log).check_answer_prompt, href: "/lettings-logs/#{log.id}/lead-tenant-gender-identity?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state")
     end
   end
diff --git a/spec/components/create_log_actions_component_spec.rb b/spec/components/create_log_actions_component_spec.rb
index eda25b246..e45513c35 100644
--- a/spec/components/create_log_actions_component_spec.rb
+++ b/spec/components/create_log_actions_component_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe CreateLogActionsComponent, type: :component do
     let(:bulk_upload) { true }
 
     it "does not render actions" do
-      expect(component.display_actions?).to eq(false)
+      expect(component.display_actions?).to be(false)
     end
   end
 
@@ -25,7 +25,7 @@ RSpec.describe CreateLogActionsComponent, type: :component do
       let(:user) { create(:user, :support) }
 
       it "renders actions" do
-        expect(component.display_actions?).to eq(true)
+        expect(component.display_actions?).to be(true)
       end
 
       it "returns create button copy" do
@@ -60,7 +60,7 @@ RSpec.describe CreateLogActionsComponent, type: :component do
         let(:log_type) { "sales" }
 
         it "renders actions" do
-          expect(component.display_actions?).to eq(true)
+          expect(component.display_actions?).to be(true)
         end
 
         it "returns create button copy" do
@@ -97,7 +97,7 @@ RSpec.describe CreateLogActionsComponent, type: :component do
         let(:user) { create(:user) }
 
         it "renders actions" do
-          expect(component.display_actions?).to eq(true)
+          expect(component.display_actions?).to be(true)
         end
 
         it "returns create button copy" do
@@ -122,7 +122,7 @@ RSpec.describe CreateLogActionsComponent, type: :component do
           let(:log_type) { "sales" }
 
           it "renders actions" do
-            expect(component.display_actions?).to eq(true)
+            expect(component.display_actions?).to be(true)
           end
 
           it "returns create button copy" do
@@ -147,7 +147,7 @@ RSpec.describe CreateLogActionsComponent, type: :component do
             end
 
             it "renders actions" do
-              expect(component.display_actions?).to eq(true)
+              expect(component.display_actions?).to be(true)
             end
           end
 
@@ -159,7 +159,7 @@ RSpec.describe CreateLogActionsComponent, type: :component do
             end
 
             it "renders actions" do
-              expect(component.display_actions?).to eq(false)
+              expect(component.display_actions?).to be(false)
             end
           end
 
@@ -170,7 +170,7 @@ RSpec.describe CreateLogActionsComponent, type: :component do
             end
 
             it "does not render actions" do
-              expect(component.display_actions?).to eq(false)
+              expect(component.display_actions?).to be(false)
             end
           end
         end
diff --git a/spec/components/data_protection_confirmation_banner_component_spec.rb b/spec/components/data_protection_confirmation_banner_component_spec.rb
index fb687f25c..022f44310 100644
--- a/spec/components/data_protection_confirmation_banner_component_spec.rb
+++ b/spec/components/data_protection_confirmation_banner_component_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
     let(:organisation) { nil }
 
     it "does not display banner" do
-      expect(component.display_banner?).to eq(false)
+      expect(component.display_banner?).to be(false)
       expect(render.content).to be_empty
     end
   end
@@ -24,7 +24,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
     end
 
     it "displays the banner" do
-      expect(component.display_banner?).to eq(true)
+      expect(component.display_banner?).to be(true)
       expect(render).to have_link(
         "Contact helpdesk to assign a data protection officer",
         href: "https://mhclgdigital.atlassian.net/servicedesk/customer/portal/6/group/11",
@@ -41,7 +41,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
         let!(:dpo) { create(:user, :data_protection_officer, organisation:, with_dsa: false) }
 
         it "displays the banner and shows DPOs" do
-          expect(component.display_banner?).to eq(true)
+          expect(component.display_banner?).to be(true)
           expect(render.css("a")).to be_empty
           expect(render).to have_selector("p", text: "Your data protection officer must accept the Data Sharing Agreement on CORE before you can create any logs.")
           expect(render).to have_selector("p", text: "You can ask: #{dpo.name}")
@@ -53,7 +53,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
         let(:user) { create(:user, :data_protection_officer, organisation:, with_dsa: false) }
 
         it "displays the banner and asks to sign" do
-          expect(component.display_banner?).to eq(true)
+          expect(component.display_banner?).to be(true)
           expect(render).to have_link(
             "Read the Data Sharing Agreement",
             href: "/organisations/#{organisation.id}/data-sharing-agreement",
@@ -71,7 +71,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
         end
 
         it "displays the banner and asks to sign" do
-          expect(component.display_banner?).to eq(true)
+          expect(component.display_banner?).to be(true)
           expect(render).to have_link(
             "Read the Data Sharing Agreement",
             href: "/organisations/#{organisation.id}/data-sharing-agreement",
@@ -83,7 +83,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
 
     context "when org has a signed data sharing agremeent" do
       it "does not display banner" do
-        expect(component.display_banner?).to eq(false)
+        expect(component.display_banner?).to be(false)
         expect(render.content).to be_empty
       end
 
@@ -99,7 +99,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
           end
 
           it "does not display banner" do
-            expect(component.display_banner?).to eq(false)
+            expect(component.display_banner?).to be(false)
             expect(render.content).to be_empty
           end
         end
@@ -111,7 +111,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
           end
 
           it "displays the banner and asks to create stock owners" do
-            expect(component.display_banner?).to eq(true)
+            expect(component.display_banner?).to be(true)
             expect(render).to have_link(
               "View or add stock owners",
               href: "/organisations/#{organisation.id}/stock-owners",
@@ -128,7 +128,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
       end
 
       it "displays the banner" do
-        expect(component.display_banner?).to eq(true)
+        expect(component.display_banner?).to be(true)
         expect(render).to have_link(
           "Contact helpdesk to assign a data protection officer",
           href: "https://mhclgdigital.atlassian.net/servicedesk/customer/portal/6/group/11",
@@ -145,7 +145,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
           let!(:dpo) { create(:user, :data_protection_officer, organisation:, with_dsa: false) }
 
           it "displays the banner and shows DPOs" do
-            expect(component.display_banner?).to eq(true)
+            expect(component.display_banner?).to be(true)
             expect(render.css("a")).to be_empty
             expect(render).to have_selector("p", text: "Your data protection officer must accept the Data Sharing Agreement on CORE before you can create any logs.")
             expect(render).to have_selector("p", text: "You can ask: #{dpo.name}")
@@ -158,7 +158,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
             end
 
             it "displays the banner and shows DPOs" do
-              expect(component.display_banner?).to eq(true)
+              expect(component.display_banner?).to be(true)
               expect(render.css("a")).to be_empty
               expect(render).to have_selector("p", text: "Your data protection officer must accept the Data Sharing Agreement on CORE before you can create any logs.")
               expect(render).to have_selector("p", text: "You can ask: #{dpo.name}")
@@ -171,7 +171,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
           let(:user) { create(:user, :data_protection_officer, organisation:, with_dsa: false) }
 
           it "displays the banner and asks to sign" do
-            expect(component.display_banner?).to eq(true)
+            expect(component.display_banner?).to be(true)
             expect(render).to have_link(
               "Read the Data Sharing Agreement",
               href: "/organisations/#{organisation.id}/data-sharing-agreement",
@@ -186,7 +186,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
             end
 
             it "displays the banner and asks to sign" do
-              expect(component.display_banner?).to eq(true)
+              expect(component.display_banner?).to be(true)
               expect(render).to have_link(
                 "Read the Data Sharing Agreement",
                 href: "/organisations/#{organisation.id}/data-sharing-agreement",
@@ -199,7 +199,7 @@ RSpec.describe DataProtectionConfirmationBannerComponent, type: :component do
 
       context "when org has a signed data sharing agremeent" do
         it "does not display banner" do
-          expect(component.display_banner?).to eq(false)
+          expect(component.display_banner?).to be(false)
           expect(render.content).to be_empty
         end
       end
diff --git a/spec/db/seeds_spec.rb b/spec/db/seeds_spec.rb
index 6ae07ddb0..9d6f0fdad 100644
--- a/spec/db/seeds_spec.rb
+++ b/spec/db/seeds_spec.rb
@@ -17,8 +17,7 @@ RSpec.describe "seeding process", type: task do
     Rake.application.rake_require("tasks/rent_ranges")
     Rake::Task.define_task(:environment)
 
-    allow(Rails.env).to receive(:test?).and_return(false)
-    allow(Rails.env).to receive(:review?).and_return(true)
+    allow(Rails.env).to receive_messages(test?: false, review?: true)
   end
 
   # Doing this in one test should save ~2 minutes
diff --git a/spec/factories/data_protection_confirmation.rb b/spec/factories/data_protection_confirmation.rb
index 5295e3a52..4710ee0f8 100644
--- a/spec/factories/data_protection_confirmation.rb
+++ b/spec/factories/data_protection_confirmation.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :data_protection_confirmation do
     organisation { association :organisation, data_protection_confirmation: instance }
-    data_protection_officer { association :user, :data_protection_officer, organisation: (instance.organisation || organisation) }
+    data_protection_officer { association :user, :data_protection_officer, organisation: instance.organisation || organisation }
 
     organisation_name { organisation.name }
     organisation_address { organisation.address_row }
diff --git a/spec/features/accessibility_spec.rb b/spec/features/accessibility_spec.rb
index bfb962c57..d039a70b5 100644
--- a/spec/features/accessibility_spec.rb
+++ b/spec/features/accessibility_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe "Accessibility", js: true do
+RSpec.describe "Accessibility", :js do
   let(:user) { create(:user, :support) }
   let!(:other_user) { create(:user, name: "new user", organisation: user.organisation, email: "new_user@example.com", confirmation_token: "abc") }
   let(:storage_service) { instance_double(Storage::S3Service, get_file_metadata: nil) }
diff --git a/spec/features/bulk_upload_lettings_logs_spec.rb b/spec/features/bulk_upload_lettings_logs_spec.rb
index 3dabfdeac..d900f6b97 100644
--- a/spec/features/bulk_upload_lettings_logs_spec.rb
+++ b/spec/features/bulk_upload_lettings_logs_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe "Bulk upload lettings log" do
 
   let(:stub_file_upload) do
     vcap_services = { "aws-s3-bucket" => {} }
-    mock_storage_service = instance_double("S3Service")
+    mock_storage_service = instance_double(Storage::S3Service)
 
     allow(ENV).to receive(:[])
     allow(ENV).to receive(:[]).with("VCAP_SERVICES").and_return(vcap_services.to_json)
@@ -76,7 +76,7 @@ RSpec.describe "Bulk upload lettings log" do
     end
 
     it "shows file to large error" do
-      stub_const("Forms::BulkUploadForm::UploadYourFile::MAX_FILE_SIZE", 1.bytes)
+      stub_const("Forms::BulkUploadForm::UploadYourFile::MAX_FILE_SIZE", 1.byte)
       visit("/lettings-logs")
 
       click_link("Upload lettings logs in bulk")
diff --git a/spec/features/bulk_upload_sales_logs_spec.rb b/spec/features/bulk_upload_sales_logs_spec.rb
index 0899b4e44..62a3f1caa 100644
--- a/spec/features/bulk_upload_sales_logs_spec.rb
+++ b/spec/features/bulk_upload_sales_logs_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe "Bulk upload sales log" do
 
   let(:stub_file_upload) do
     vcap_services = { "aws-s3-bucket" => {} }
-    mock_storage_service = instance_double("S3Service")
+    mock_storage_service = instance_double(Storage::S3Service)
 
     allow(ENV).to receive(:[])
     allow(ENV).to receive(:[]).with("VCAP_SERVICES").and_return(vcap_services.to_json)
@@ -71,7 +71,7 @@ RSpec.describe "Bulk upload sales log" do
     end
 
     it "shows file to large error" do
-      stub_const("Forms::BulkUploadForm::UploadYourFile::MAX_FILE_SIZE", 1.bytes)
+      stub_const("Forms::BulkUploadForm::UploadYourFile::MAX_FILE_SIZE", 1.byte)
       visit("/sales-logs")
       click_link("Upload sales logs in bulk")
 
diff --git a/spec/features/form/accessible_autocomplete_spec.rb b/spec/features/form/accessible_autocomplete_spec.rb
index 0eb32c4a5..c381459a7 100644
--- a/spec/features/form/accessible_autocomplete_spec.rb
+++ b/spec/features/form/accessible_autocomplete_spec.rb
@@ -25,38 +25,38 @@ RSpec.describe "Accessible Autocomplete" do
       visit("/lettings-logs/#{lettings_log.id}/previous-local-authority")
     end
 
-    it "allows type ahead filtering", js: true do
+    it "allows type ahead filtering", :js do
       find("#lettings-log-prevloc-field").click.native.send_keys("T", "h", "a", "n", :down, :enter)
       expect(find("#lettings-log-prevloc-field").value).to eq("Thanet")
     end
 
-    it "ignores punctuation", js: true do
+    it "ignores punctuation", :js do
       find("#lettings-log-prevloc-field").click.native.send_keys("T", "h", "a", "'", "n", :down, :enter)
       expect(find("#lettings-log-prevloc-field").value).to eq("Thanet")
     end
 
-    it "ignores stop words", js: true do
+    it "ignores stop words", :js do
       find("#lettings-log-prevloc-field").click.native.send_keys("t", "h", "e", " ", "W", "e", "s", "t", "m", :down, :enter)
       expect(find("#lettings-log-prevloc-field").value).to eq("Westmorland and Furness")
     end
 
-    it "does not perform an exact match", js: true do
+    it "does not perform an exact match", :js do
       find("#lettings-log-prevloc-field").click.native.send_keys("K", "i", "n", "g", "s", "t", "o", "n", " ", "T", "h", "a", "m", "e", "s", :down, :enter)
       expect(find("#lettings-log-prevloc-field").value).to eq("Kingston upon Thames")
     end
 
-    it "maintains enhancement state across back navigation", js: true do
+    it "maintains enhancement state across back navigation", :js do
       find("#lettings-log-prevloc-field").click.native.send_keys("T", "h", "a", "n", :down, :enter)
       click_button("Save and continue")
       page.go_back
       expect(page).to have_selector("input", class: "autocomplete__input", count: 1)
     end
 
-    it "displays the placeholder text", js: true do
+    it "displays the placeholder text", :js do
       expect(find("#lettings-log-prevloc-field")["placeholder"]).to eq("Start typing to search")
     end
 
-    context "and multiple schemes with same names", js: true do
+    context "and multiple schemes with same names", :js do
       let(:lettings_log) { FactoryBot.create(:lettings_log, :sh, assigned_to: user) }
       let!(:schemes) { FactoryBot.create_list(:scheme, 2, owning_organisation_id: user.organisation_id, service_name: "Scheme", primary_client_group: "O", secondary_client_group: "O") }
 
@@ -98,18 +98,18 @@ RSpec.describe "Accessible Autocomplete" do
       visit("/lettings-logs/#{lettings_log.id}/scheme")
     end
 
-    it "can match on synonyms", js: true do
+    it "can match on synonyms", :js do
       find("#lettings-log-scheme-id-field").click.native.send_keys("w", "6", :down, :enter)
       expect(find("#lettings-log-scheme-id-field").value).to include(scheme.service_name)
     end
 
-    it "displays appended text next to the options", js: true do
+    it "displays appended text next to the options", :js do
       find("#lettings-log-scheme-id-field").click.native.send_keys("w", "6", :down, :enter)
       expect(find(".autocomplete__option", visible: :hidden, text: scheme.service_name)).to be_present
       expect(find("span", visible: :hidden, text: "2 completed locations, 1 incomplete location")).to be_present
     end
 
-    it "displays hint text under the options", js: true do
+    it "displays hint text under the options", :js do
       find("#lettings-log-scheme-id-field").click.native.send_keys("w", "6", :down, :enter)
       expect(find(".autocomplete__option__hint", visible: :hidden, text: /Young people at risk, Young people leaving care/)).to be_present
     end
diff --git a/spec/features/form/address_search_spec.rb b/spec/features/form/address_search_spec.rb
index cd1738195..58125eb09 100644
--- a/spec/features/form/address_search_spec.rb
+++ b/spec/features/form/address_search_spec.rb
@@ -22,17 +22,17 @@ RSpec.describe "Address Search" do
       visit("/sales-logs/#{sales_log.id}/address-search")
     end
 
-    it "allows searching by a UPRN", js: true do
+    it "allows searching by a UPRN", :js do
       find("#sales-log-uprn-field").click.native.send_keys("1", "0", "0", "3", "3", "5", "4", "4", "6", "1", "4", :down)
       expect(find("#sales-log-uprn-field").value).to eq("10033544614")
     end
 
-    it "allows searching by address", js: true do
+    it "allows searching by address", :js do
       find("#sales-log-uprn-field").click.native.send_keys("S", "W", "1", "5", :down, :enter)
       expect(find("#sales-log-uprn-field").value).to eq("SW15")
     end
 
-    it "displays the placeholder text", js: true do
+    it "displays the placeholder text", :js do
       expect(find("#sales-log-uprn-field")["placeholder"]).to eq("Start typing to search")
     end
 
diff --git a/spec/features/form/checkboxes_spec.rb b/spec/features/form/checkboxes_spec.rb
index 258d9376d..a020da2f4 100644
--- a/spec/features/form/checkboxes_spec.rb
+++ b/spec/features/form/checkboxes_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe "Checkboxes" do
     sign_in user
   end
 
-  context "when exclusive checkbox is selected", js: true do
+  context "when exclusive checkbox is selected", :js do
     it "deselects all other checkboxes" do
       visit("/lettings-logs/#{id}/accessibility-requirements")
       page.check("lettings-log-accessibility-requirements-housingneeds-a-field", allow_label_click: true)
diff --git a/spec/features/form/conditional_questions_spec.rb b/spec/features/form/conditional_questions_spec.rb
index 4a194c4dc..ec0960e08 100644
--- a/spec/features/form/conditional_questions_spec.rb
+++ b/spec/features/form/conditional_questions_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe "Form Conditional Questions" do
       expect(page).not_to have_selector("#armed_forces_injured_div")
     end
 
-    it "shows conditional questions if the required answer is selected and hides it again when a different answer option is selected", js: true do
+    it "shows conditional questions if the required answer is selected and hides it again when a different answer option is selected", :js do
       visit("/lettings-logs/#{id}/armed-forces")
       # Something about our styling makes the selenium webdriver think the actual radio buttons are not visible so we allow label click here
       choose("lettings-log-armedforces-1-field", allow_label_click: true)
@@ -59,7 +59,7 @@ RSpec.describe "Form Conditional Questions" do
     end
   end
 
-  context "when a conditional question has a saved answer", js: true do
+  context "when a conditional question has a saved answer", :js do
     before do
       allow(sales_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
       allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
@@ -96,7 +96,7 @@ RSpec.describe "Form Conditional Questions" do
       FormHandler.instance.use_real_forms!
     end
 
-    it "shows conditional questions if the required answer is selected and hides it again when a different answer option is selected", js: true do
+    it "shows conditional questions if the required answer is selected and hides it again when a different answer option is selected", :js do
       visit("/lettings-logs/#{id}/lead-tenant-age")
       choose("lettings-log-age1-known-0-field", allow_label_click: true)
       fill_in("lettings-log-age1-field", with: "200")
diff --git a/spec/features/form/page_routing_spec.rb b/spec/features/form/page_routing_spec.rb
index 470a2f8ed..6fd8f8a2e 100644
--- a/spec/features/form/page_routing_spec.rb
+++ b/spec/features/form/page_routing_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe "Form Page Routing" do
       Singleton.__init__(FormHandler)
     end
 
-    it "can route the user to a different page based on their answer on the current page", js: true do
+    it "can route the user to a different page based on their answer on the current page", :js do
       visit("/lettings-logs/#{id}/conditional-question")
       # using a question name that is already in the db to avoid
       # having to add a new column to the db for this test
@@ -43,7 +43,7 @@ RSpec.describe "Form Page Routing" do
       expect(page).to have_current_path("/lettings-logs/#{id}/conditional-question-no-page")
     end
 
-    it "can route based on multiple conditions", js: true do
+    it "can route based on multiple conditions", :js do
       visit("/lettings-logs/#{id}/person-1-gender")
       choose("lettings-log-sex1-f-field", allow_label_click: true)
       click_button("Save and continue")
@@ -57,7 +57,7 @@ RSpec.describe "Form Page Routing" do
       expect(page).to have_current_path("/lettings-logs/#{id}/conditional-question/check-answers")
     end
 
-    context "when the answers are inferred", js: true do
+    context "when the answers are inferred", :js do
       it "shows question if the answer could not be inferred" do
         visit("/lettings-logs/#{id}/property-postcode")
         fill_in("lettings-log-postcode-full-field", with: "PO5 3TE")
@@ -119,7 +119,7 @@ RSpec.describe "Form Page Routing" do
         click_button("Save and continue")
 
         expect(page).to have_current_path("/lettings-logs/#{id}/tenancy-start-date")
-        expect(find_field("lettings_log[startdate]").value).to eq(nil)
+        expect(find_field("lettings_log[startdate]").value).to be_nil
       end
 
       it "does not show see all related answers link if only 1 field has an error" do
@@ -170,21 +170,21 @@ RSpec.describe "Form Page Routing" do
     it "returns true if there is no depends_on" do
       depends_on = nil
 
-      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(true)
+      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(true)
     end
 
     it "returns true if the depends_on is met" do
       depends_on = [{ "armedforces" => 1 }]
       lettings_log.armedforces = 1
 
-      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(true)
+      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(true)
     end
 
     it "returns false if the depends_on is not met" do
       depends_on = [{ "armedforces" => 1 }]
       lettings_log.armedforces = 0
 
-      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(false)
+      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(false)
     end
 
     it "returns true if a complex depends_on is met" do
@@ -192,7 +192,7 @@ RSpec.describe "Form Page Routing" do
       lettings_log.is_la_inferred = false
       lettings_log.needstype = 1
 
-      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(true)
+      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(true)
     end
 
     it "returns false if any part of a complex depends_on is not met" do
@@ -200,7 +200,7 @@ RSpec.describe "Form Page Routing" do
       lettings_log.is_la_inferred = false
       lettings_log.needstype = 2
 
-      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(false)
+      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(false)
     end
 
     it "returns true if the first of multiple depends_ons are met" do
@@ -208,7 +208,7 @@ RSpec.describe "Form Page Routing" do
       lettings_log.is_la_inferred = false
       lettings_log.needstype = 2
 
-      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(true)
+      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(true)
     end
 
     it "returns true if the last of multiple depends_ons are met" do
@@ -216,7 +216,7 @@ RSpec.describe "Form Page Routing" do
       lettings_log.is_la_inferred = true
       lettings_log.needstype = 1
 
-      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(true)
+      expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(true)
     end
 
     context "with operator-based depends_ons" do
@@ -234,7 +234,7 @@ RSpec.describe "Form Page Routing" do
         lettings_log.details_known_2 = 0
         lettings_log.age2 = 16
 
-        expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(true)
+        expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(true)
       end
 
       it "returns false if an operator-based depends_on is not met" do
@@ -251,7 +251,7 @@ RSpec.describe "Form Page Routing" do
         lettings_log.details_known_2 = 0
         lettings_log.age2 = 15
 
-        expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(false)
+        expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(false)
       end
 
       it "returns true if an operator-based depends_on is met on an inequality threshold" do
@@ -268,7 +268,7 @@ RSpec.describe "Form Page Routing" do
         lettings_log.details_known_2 = 0
         lettings_log.age2 = 15
 
-        expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to eq(true)
+        expect(lettings_log.form.depends_on_met(depends_on, lettings_log)).to be(true)
       end
     end
   end
diff --git a/spec/features/form/progressive_total_field_spec.rb b/spec/features/form/progressive_total_field_spec.rb
index cde7f9f2d..1f90a4483 100644
--- a/spec/features/form/progressive_total_field_spec.rb
+++ b/spec/features/form/progressive_total_field_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe "Accessible Autocomplete" do
     expect(page).to have_selector("#tcharge_div", visible: :all)
   end
 
-  it "does show when js is enabled and calculates the total", js: true do
+  it "does show when js is enabled and calculates the total", :js do
     visit("/lettings-logs/#{lettings_log.id}/rent")
     expect(page).to have_selector("#tcharge_div")
     fill_in("lettings-log-brent-field", with: 5)
@@ -40,7 +40,7 @@ RSpec.describe "Accessible Autocomplete" do
     expect(find("#lettings-log-tcharge-field").value).to eq("8.00")
   end
 
-  it "total displays despite error message", js: true do
+  it "total displays despite error message", :js do
     visit("/lettings-logs/#{lettings_log.id}/rent")
     choose("lettings-log-period-1-field", allow_label_click: true)
     fill_in("lettings-log-brent-field", with: 500)
diff --git a/spec/features/form/saving_data_spec.rb b/spec/features/form/saving_data_spec.rb
index b8332d77f..9b29f67e1 100644
--- a/spec/features/form/saving_data_spec.rb
+++ b/spec/features/form/saving_data_spec.rb
@@ -62,7 +62,7 @@ RSpec.describe "Form Saving Data" do
     end
   end
 
-  it "updates total value of the rent", js: true do
+  it "updates total value of the rent", :js do
     visit("/lettings-logs/#{id}/rent")
 
     fill_in("lettings-log-brent-field", with: 3.02)
diff --git a/spec/features/form/validations_spec.rb b/spec/features/form/validations_spec.rb
index 96875d219..7ac8f6685 100644
--- a/spec/features/form/validations_spec.rb
+++ b/spec/features/form/validations_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe "validations" do
     end
   end
 
-  describe "date validation", js: true do
+  describe "date validation", :js do
     def fill_in_date(lettings_log_id, question, day, month, year, path)
       visit("/lettings-logs/#{lettings_log_id}/#{path}")
       fill_in("lettings_log[#{question}]", with: [day, month, year].join("/"))
diff --git a/spec/features/lettings_log_spec.rb b/spec/features/lettings_log_spec.rb
index 15d24e5ed..a661f6f12 100644
--- a/spec/features/lettings_log_spec.rb
+++ b/spec/features/lettings_log_spec.rb
@@ -398,7 +398,7 @@ RSpec.describe "Lettings Log Features" do
       rows = page.find_all "tbody tr"
       expect(rows.count).to be 2
       id_to_delete, id_to_keep = rows.map { |row| row.first("td").text.to_i }
-      expect([id_to_delete, id_to_keep]).to match_array [lettings_log_1.id, lettings_log_2.id]
+      expect([id_to_delete, id_to_keep]).to contain_exactly(lettings_log_1.id, lettings_log_2.id)
       check "forms-delete-logs-form-selected-ids-#{id_to_delete}-field"
       uncheck "forms-delete-logs-form-selected-ids-#{id_to_keep}-field"
       click_button "Continue"
@@ -413,13 +413,13 @@ RSpec.describe "Lettings Log Features" do
       expect(page.find("article.app-log-summary h2").text).to eq "Log #{id_to_keep}"
       deleted_log = LettingsLog.find(id_to_delete)
       expect(deleted_log.status).to eq "deleted"
-      expect(deleted_log.discarded_at).not_to be nil
+      expect(deleted_log.discarded_at).not_to be_nil
     end
 
     context "when visiting the bulk uploads page" do
       let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2, category: nil) }
       let(:bulk_upload) { create(:bulk_upload, :lettings, user: support_user, bulk_upload_errors:, total_logs_count: 10) }
-      let(:mock_storage_service) { instance_double("S3Service") }
+      let(:mock_storage_service) { instance_double(Storage::S3Service) }
 
       before do
         allow(Storage::S3Service).to receive(:new).and_return(mock_storage_service)
diff --git a/spec/features/sales_log_spec.rb b/spec/features/sales_log_spec.rb
index a70f11014..97e6549d0 100644
--- a/spec/features/sales_log_spec.rb
+++ b/spec/features/sales_log_spec.rb
@@ -91,7 +91,7 @@ RSpec.describe "Sales Log Features" do
         expect(page.find("article.app-log-summary h2").text).to eq "Log #{id_to_keep}"
         deleted_log = SalesLog.find(id_to_delete)
         expect(deleted_log.status).to eq "deleted"
-        expect(deleted_log.discarded_at).not_to be nil
+        expect(deleted_log.discarded_at).not_to be_nil
       end
     end
   end
@@ -322,7 +322,7 @@ RSpec.describe "Sales Log Features" do
     context "when visiting the bulk uploads page" do
       let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2, category: nil) }
       let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, total_logs_count: 10) }
-      let(:mock_storage_service) { instance_double("S3Service") }
+      let(:mock_storage_service) { instance_double(Storage::S3Service) }
 
       before do
         allow(Storage::S3Service).to receive(:new).and_return(mock_storage_service)
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index ec053b615..3e59e0921 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -297,7 +297,7 @@ RSpec.describe "Schemes scheme Features" do
 
                   it "displays all schemes after I clear the search results" do
                     click_link("Clear search")
-                    Location.all.each do |location|
+                    Location.all.find_each do |location|
                       expect(page).to have_content(location.name)
                     end
                   end
@@ -953,7 +953,7 @@ RSpec.describe "Schemes scheme Features" do
 
                   it "displays all schemes after I clear the search results" do
                     click_link("Clear search")
-                    Location.all.each do |location|
+                    Location.all.find_each do |location|
                       expect(page).to have_content(location.name)
                     end
                   end
diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb
index 0be4f4daa..0f75a562a 100644
--- a/spec/features/user_spec.rb
+++ b/spec/features/user_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe "User Features" do
       expect(page).to have_current_path("/lettings-logs")
     end
 
-    it "can log out again", js: true do
+    it "can log out again", :js do
       visit("/lettings-logs")
       fill_in("user[email]", with: user.email)
       fill_in("user[password]", with: "pAssword1")
@@ -157,8 +157,7 @@ RSpec.describe "User Features" do
     end
 
     it "does not show 'Sign in' link when both the service_moved? and service_unavailable? feature toggles are on" do
-      allow(FeatureToggle).to receive(:service_moved?).and_return(true)
-      allow(FeatureToggle).to receive(:service_unavailable?).and_return(true)
+      allow(FeatureToggle).to receive_messages(service_moved?: true, service_unavailable?: true)
       visit("/lettings-logs")
       expect(page).not_to have_link("Sign in")
     end
@@ -363,8 +362,7 @@ RSpec.describe "User Features" do
       end
 
       it "does not show 'Your account' or 'Sign out' links when both the service_moved? and service_unavailable? feature toggles are on" do
-        allow(FeatureToggle).to receive(:service_moved?).and_return(true)
-        allow(FeatureToggle).to receive(:service_unavailable?).and_return(true)
+        allow(FeatureToggle).to receive_messages(service_moved?: true, service_unavailable?: true)
         visit("/lettings-logs")
         expect(page).not_to have_link("Your account")
         expect(page).not_to have_link("Sign out")
@@ -796,7 +794,7 @@ RSpec.describe "User Features" do
     end
 
     context "when viewing logs" do
-      context "when filtering by owning organisation and then switching back to all organisations", js: true do
+      context "when filtering by owning organisation and then switching back to all organisations", :js do
         let!(:organisation) { create(:organisation) }
         let(:parent_organisation) { create(:organisation, name: "Filtered Org") }
 
diff --git a/spec/fixtures/files/lettings_log_csv_export_codes_26.csv b/spec/fixtures/files/lettings_log_csv_export_codes_26.csv
index aacc8581d..b99c44ce8 100644
--- a/spec/fixtures/files/lettings_log_csv_export_codes_26.csv
+++ b/spec/fixtures/files/lettings_log_csv_export_codes_26.csv
@@ -1,3 +1,3 @@
-Log ID,Status of log,ID of a set of duplicate logs,User the log is created by,User the log is assigned to,Is the user in the assigned_to column the data protection officer?,Time and date the log was created,User who last updated the log,Time and date the log was last updated,Was the log submitted in-service or via bulk upload?,Year collection period opened,ID of a set of bulk uploaded logs,Which organisation owns this property?,Which organisation manages this letting?,What is the needs type?,What is the letting type?,Is this letting a renewal?,What is the tenancy start date?,"What is the rent type? (grouped into SR, IR or AR)",What is the rent type?,Which type of Intermediate Rent is this letting?,Which 'Other' type of Intermediate Rent is this letting?,Is this a London Affordable Rent letting?,What is the tenant code?,What is the property reference?,Has the tenant seen the MHCLG privacy notice?,Is this the first time the property has been let as social housing?,What rent product was the property most recently let as?,What is the reason for the property being vacant?,Is this property new to the social rented sector?,"If known, property's UPRN",Address line 1,Address line 2,Town or City,County,Postcode,The internal value to indicate if the LA was inferred from the postcode,What is the property's local authority?,Local authority code,Is the UPRN known?,UPRN of the address selected,Was the 'No address found' page seen?,Address line 1 input from address matching feature,Postcode input from address matching feature,Address line 1 entered in bulk upload file,Address line 2 entered in bulk upload file,Town or city entered in bulk upload file,County entered in bulk upload file,Postcode entered in bulk upload file,Local authority entered in bulk upload file,What type of unit is the property?,Is the property built or adapted to wheelchair-user standards?,How many bedrooms does the property have?,What is the void date?,Number of days the property was vacant,The following soft validation was confirmed: You told us that the property has been vacant for more than 2 years. This is higher than we would expect.,Were any major repairs carried out during the void period?,What date were any major repairs completed on?,The following soft validation was confirmed: You told us the property has been vacant for 2 years. This is higher than we would expect.,Is this letting in sheltered accommodation?,Is this a joint tenancy?,Is this a starter tenancy?,What is the type of tenancy?,"If 'Other', what is the type of tenancy?",What is the length of the fixed-term tenancy to the nearest year?,How many people live in the household at this letting?,The following soft validation was confirmed: You told us somebody in the household is pregnant. You also told us there are no female tenants living at the property.,"Where household characteristics have a 'Refused' option for some or all of: AGE1-AGE8, SEX1-SEX8, RELAT2-RELAT8, ECSTAT1-ECSTAT8","Type of household 1 = 1 elder; 2 = 2 adults, including elder(s); 3 = 1 adult; 4 = 2 adults; 5 = 1 adult & 1+ children; 6 = 2+ adults & 1+ children; 9 = Other",Total number of dependent children in the household (Sum of when RELAT2-8 = C),Total number of elders in household (Sum of when AGE1-8 >= 60),Total number of adults in household,What is the lead tenant's age?,The following soft validation was confirmed: You told us this person is aged %{age} years and retired. The minimum expected retirement age for %{gender} in England is %{age}.,What was the lead tenant's sex at birth?,Is the gender the lead tenant identifies with the same as their sex registered at birth?,"If 'No', enter the lead tenant's gender identity",What is the lead tenant's ethnic group?,Which of these best describes the lead tenant's ethnic background?,What is the lead tenant's nationality?,Which of these best describes the lead tenant's working situation?,The following soft validation was confirmed: You have said that at least one person's situation is 'Unable to work because of long-term sickness or disability'.,Are the details of tenant 2 known?,What is person 2's age?,What is person 2's relationship to the lead tenant?,The following soft validation was confirmed: You said that more than one person in the household is the partner of the lead tenant. Are you sure this is correct?,What was person 2's sex at birth?,Is the gender person 2 identifies with the same as their sex registered at birth?,"If 'No', enter person 2's gender identity",Which of these best describes person 2's working situation?,Are the details of tenant 3 known?,What is person 3's age?,What is person 3's relationship to the lead tenant?,What was person 3's sex at birth?,Is the gender person 3 identifies with the same as their sex registered at birth?,"If 'No', enter person 3's gender identity",Which of these best describes person 3's working situation?,Are the details of tenant 4 known?,What is person 4's age?,What is person 4's relationship to the lead tenant?,What was person 4's sex at birth?,Is the gender person 4 identifies with the same as their sex registered at birth?,"If 'No', enter person 4's gender identity",Which of these best describes person 4's working situation?,Are the details of tenant 5 known?,What is person 5's age?,What is person 5's relationship to the lead tenant?,What was person 5's sex at birth?,Is the gender person 5 identifies with the same as their sex registered at birth?,"If 'No', enter person 5's gender identity",Which of these best describes person 5's working situation?,Are the details of tenant 6 known?,What is person 6's age?,What is person 6's relationship to the lead tenant?,What was person 6's sex at birth?,Is the gender person 6 identifies with the same as their sex registered at birth?,"If 'No', enter person 6's gender identity",Which of these best describes person 6's working situation?,Are the details of tenant 7 known?,What is person 7's age?,What is person 7's relationship to the lead tenant?,What was person 7's sex at birth?,Is the gender person 7 identifies with the same as their sex registered at birth?,"If 'No', enter person 7's gender identity",Which of these best describes person 7's working situation?,Are the details of tenant 8 known?,What is person 8's age?,What is person 8's relationship to the lead tenant?,What was person 8's sex at birth?,Is the gender person 8 identifies with the same as their sex registered at birth?,"If 'No', enter person 8's gender identity",Which of these best describes person 8's working situation?,Does anybody in the household have links to the UK armed forces?,Is this person still serving in the UK armed forces?,Was this person seriously injured or ill as a result of serving in the UK armed forces?,Is anybody in the household pregnant?,Does anybody in the household have any disabled access needs?,"What access needs do they have? (Fully wheelchair-accessible housing, Level access housing or Wheelchair access to essential rooms)",Disabled access needs a) Fully wheelchair-accessible housing,Disabled access needs b) Wheelchair access to essential rooms,Disabled access needs c) Level access housing,Disabled access needs f) Other disabled access needs,Disabled access needs g) No disabled access needs,Disabled access needs h) Don't know,Do they have any other disabled access needs?,Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?,Does this person's condition affect their dexterity?,Does this person's condition affect their learning or understanding or concentrating?,Does this person's condition affect their hearing?,Does this person's condition affect their memory?,Does this person's condition affect their mental health?,Does this person's condition affect their mobility?,Does this person's condition affect them socially or behaviourally?,Does this person's condition affect their stamina or breathing or fatigue?,Does this person's condition affect their vision?,Does this person's condition affect them in another way?,How long has the household continuously lived in the local authority area of the new letting?,How long has the household been on the local authority waiting list for the new letting?,What is the tenant's main reason for the household leaving their last settled home?,"If 'Other', what was the main reason for leaving their last settled home?",The soft validation was confirmed,Where was the household immediately before this letting?,Did the household experience homelessness immediately before this letting?,Previous postcode unknown or previous accommodation was temporary,What is the postcode of the household's last settled home?,Was the local authority of the household's last settled home known?,The internal value to indicate if the previous LA was inferred from the postcode,Previous location LA name,Previous location's ONS LA Code,Was the household given reasonable preference by the local authority?,Reasonable preference reason - They were homeless or about to lose their home (within 56 days),"Reasonable preference reason - They were living in insanitary, overcrowded or unisatisfactory housing",Reasonable preference reason - They needed to move on medical and welfare reasons (including disability),Reasonable preference reason - They needed to move to avoid hardship to themselves or others,Reasonable preference reason - Don't Know,Was the letting made under Choice-Based Lettings (CBL)?,Was the letting made under the Common Allocation Policy (CAP)?,Was the letting made under the Common Housing Register (CHR)?,Was the letting made under the Accessible Register?,"The letting was not allocated under CBL, CAP, CHR or Accessible Register.",What was the source of referral for this letting?,What was the source of referral for this letting?,What was the source of referral for this letting?,Do you know the household's combined income after tax?,Was the household income refused?,How often does the household receive income?,How much income does the household have in total?,Populated when someone hits the soft validation and confirmed in the service,Is the tenant likely to be receiving any of these housing-related benefits?,"Does the tenant receive housing-related benefits? Yes if hb = Universal Credit housing element or Housing benefit, No if hb =  Don't Know, Neither, Tenant prefers not to say or blank","How much of the household's income is from Universal Credit, state pensions or benefits?",Does the household pay rent or other charges for the accommodation?,Does the household pay rent or other charges for the accommodation? - flag for when household_charge is answered no,How often does the household pay rent and other charges?,What is the basic rent?,Weekly rent,Populated when the soft validation and confirmed in the service,What is the service charge?,Weekly service charge,What is the personal service charge?,Weekly personal service charge,What is the support charge?,Weekly support charge,Total charge to the tenant,Weekly total charge to the tenant,Populated when the soft validation and confirmed in the service,Populated when the soft validation and confirmed in the service,Populated when the soft validation and confirmed in the service,"After the household has received any housing-related benefits, will they still need to pay for rent and charges?",Can you estimate the outstanding amount?,Estimated outstanding amount,Weekly total rent shortfall charge for tenant receiving housing benefit,What scheme does this letting belong to?,"From scheme code, we map to the scheme name",Does the scheme contain confidential information?,"What is this type of scheme? (Direct access hostel), Foyer, Housing for older people or Other supported housing",Is this scheme registered under the Care Standards Act 2000?,Which organisation owns the housing stock for this scheme?,What client group is this scheme intended for?,Does this scheme provide for another client group?,What is the other client group?,What support does this scheme provide?,Intended length of stay,Date scheme was created,Which location is this letting for?,What is the postcode for this location?,What is the name of this location?,How many units are at this location?,What is the most common type of unit at this location?,What are the mobility standards for the majority of the units in this location?,What is the local authority of this postcode?,When did the first property in this location become available under this scheme?
-id,status,duplicate_set_id,created_by,assigned_to,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,bulk_upload_id,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,declaration,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,uprn,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,uprn_known,uprn_selection,address_search_value_check,address_line1_input,postcode_full_input,address_line1_as_entered,address_line2_as_entered,town_or_city_as_entered,county_as_entered,postcode_full_as_entered,la_as_entered,unittype_gn,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,sheltered,joint,startertenancy,tenancy,tenancyother,tenancylength,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sexrab1,gender_same_as_sex1,gender_description1,ethnic_group,ethnic,nationality_all,ecstat1,working_situation_illness_check,details_known_2,age2,relat2,multiple_partners_value_check,sexrab2,gender_same_as_sex2,gender_description2,ecstat2,details_known_3,age3,relat3,sexrab3,gender_same_as_sex3,gender_description3,ecstat3,details_known_4,age4,relat4,sexrab4,gender_same_as_sex4,gender_description4,ecstat4,details_known_5,age5,relat5,sexrab5,gender_same_as_sex5,gender_description5,ecstat5,details_known_6,age6,relat6,sexrab6,gender_same_as_sex6,gender_description6,ecstat6,details_known_7,age7,relat7,sexrab7,gender_same_as_sex7,gender_description7,ecstat7,details_known_8,age8,relat8,sexrab8,gender_same_as_sex8,gender_description8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,reasonother_value_check,prevten,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,accessible_register,letting_allocation_none,referral_register,referral_noms,referral_org,net_income_known,incref,incfreq,earnings,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_confidential,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
-,in_progress,,s.port@jeemayle.com,s.port@jeemayle.com,false,2026-04-01T00:00:00+01:00,,2026-04-01T00:00:00+01:00,1,2026,,MHCLG,MHCLG,1,7,0,2026-04-01,2,2,,,2,HIJKLMN,ABCDEFG,1,0,2,6,2,,Address line 1,,London,,NW9 5LL,false,Barnet,E09000003,0,,,,,address line 1 as entered,address line 2 as entered,town or city as entered,county as entered,AB1 2CD,la as entered,7,1,3,2026-03-30,1,,1,2026-03-31,,,3,1,4,,2,4,,1,4,0,0,2,35,,F,1,,0,2,36,0,,0,32,P,,M,2,Non-binary,6,1,-9,R,R,3,,10,0,-9,R,R,3,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,,6,1,0,TN23 6LZ,1,false,Ashford,E07000105,1,0,1,0,0,0,0,0,1,0,0,1,,,0,0,1,268,,6,1,1,,,2,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,1,0,12.0,6.0,,,,,,,,,,,,,,,,,,,,
+Log ID,Status of log,ID of a set of duplicate logs,User the log is created by,User the log is assigned to,Is the user in the assigned_to column the data protection officer?,Time and date the log was created,User who last updated the log,Time and date the log was last updated,Was the log submitted in-service or via bulk upload?,Year collection period opened,ID of a set of bulk uploaded logs,Which organisation owns this property?,Which organisation manages this letting?,What is the needs type?,What is the letting type?,Is this letting a renewal?,What is the tenancy start date?,"What is the rent type? (grouped into SR, IR or AR)",What is the rent type?,Which type of Intermediate Rent is this letting?,Which 'Other' type of Intermediate Rent is this letting?,Is this a London Affordable Rent letting?,What is the tenant code?,What is the property reference?,Has the tenant seen the MHCLG privacy notice?,Is this the first time the property has been let as social housing?,What rent product was the property most recently let as?,What is the reason for the property being vacant?,Is this property new to the social rented sector?,"If known, property's UPRN",Address line 1,Address line 2,Town or City,County,Postcode,The internal value to indicate if the LA was inferred from the postcode,What is the property's local authority?,Local authority code,Is the UPRN known?,UPRN of the address selected,Was the 'No address found' page seen?,Address line 1 input from address matching feature,Postcode input from address matching feature,Address line 1 entered in bulk upload file,Address line 2 entered in bulk upload file,Town or city entered in bulk upload file,County entered in bulk upload file,Postcode entered in bulk upload file,Local authority entered in bulk upload file,What type of unit is the property?,Is the property built or adapted to wheelchair-user standards?,How many bedrooms does the property have?,What is the void date?,Number of days the property was vacant,The following soft validation was confirmed: You told us that the property has been vacant for more than 2 years. This is higher than we would expect.,Were any major repairs carried out during the void period?,What date were any major repairs completed on?,The following soft validation was confirmed: You told us the property has been vacant for 2 years. This is higher than we would expect.,Is this letting in sheltered accommodation?,Is this a joint tenancy?,Is this a starter tenancy?,What is the type of tenancy?,"If 'Other', what is the type of tenancy?",,What is the length of the fixed-term tenancy to the nearest year?,How many people live in the household at this letting?,The following soft validation was confirmed: You told us somebody in the household is pregnant. You also told us there are no female tenants living at the property.,"Where household characteristics have a 'Refused' option for some or all of: AGE1-AGE8, SEX1-SEX8, RELAT2-RELAT8, ECSTAT1-ECSTAT8","Type of household 1 = 1 elder; 2 = 2 adults, including elder(s); 3 = 1 adult; 4 = 2 adults; 5 = 1 adult & 1+ children; 6 = 2+ adults & 1+ children; 9 = Other",Total number of dependent children in the household (Sum of when RELAT2-8 = C),Total number of elders in household (Sum of when AGE1-8 >= 60),Total number of adults in household,What is the lead tenant's age?,The following soft validation was confirmed: You told us this person is aged %{age} years and retired. The minimum expected retirement age for %{gender} in England is %{age}.,What was the lead tenant's sex at birth?,Is the gender the lead tenant identifies with the same as their sex registered at birth?,"If 'No', enter the lead tenant's gender identity",What is the lead tenant's ethnic group?,Which of these best describes the lead tenant's ethnic background?,What is the lead tenant's nationality?,Which of these best describes the lead tenant's working situation?,The following soft validation was confirmed: You have said that at least one person's situation is 'Unable to work because of long-term sickness or disability'.,Are the details of tenant 2 known?,What is person 2's age?,What is person 2's relationship to the lead tenant?,The following soft validation was confirmed: You said that more than one person in the household is the partner of the lead tenant. Are you sure this is correct?,What was person 2's sex at birth?,Is the gender person 2 identifies with the same as their sex registered at birth?,"If 'No', enter person 2's gender identity",Which of these best describes person 2's working situation?,Are the details of tenant 3 known?,What is person 3's age?,What is person 3's relationship to the lead tenant?,What was person 3's sex at birth?,Is the gender person 3 identifies with the same as their sex registered at birth?,"If 'No', enter person 3's gender identity",Which of these best describes person 3's working situation?,Are the details of tenant 4 known?,What is person 4's age?,What is person 4's relationship to the lead tenant?,What was person 4's sex at birth?,Is the gender person 4 identifies with the same as their sex registered at birth?,"If 'No', enter person 4's gender identity",Which of these best describes person 4's working situation?,Are the details of tenant 5 known?,What is person 5's age?,What is person 5's relationship to the lead tenant?,What was person 5's sex at birth?,Is the gender person 5 identifies with the same as their sex registered at birth?,"If 'No', enter person 5's gender identity",Which of these best describes person 5's working situation?,Are the details of tenant 6 known?,What is person 6's age?,What is person 6's relationship to the lead tenant?,What was person 6's sex at birth?,Is the gender person 6 identifies with the same as their sex registered at birth?,"If 'No', enter person 6's gender identity",Which of these best describes person 6's working situation?,Are the details of tenant 7 known?,What is person 7's age?,What is person 7's relationship to the lead tenant?,What was person 7's sex at birth?,Is the gender person 7 identifies with the same as their sex registered at birth?,"If 'No', enter person 7's gender identity",Which of these best describes person 7's working situation?,Are the details of tenant 8 known?,What is person 8's age?,What is person 8's relationship to the lead tenant?,What was person 8's sex at birth?,Is the gender person 8 identifies with the same as their sex registered at birth?,"If 'No', enter person 8's gender identity",Which of these best describes person 8's working situation?,Does anybody in the household have links to the UK armed forces?,Is this person still serving in the UK armed forces?,Was this person seriously injured or ill as a result of serving in the UK armed forces?,Is anybody in the household pregnant?,Does anybody in the household have any disabled access needs?,"What access needs do they have? (Fully wheelchair-accessible housing, Level access housing or Wheelchair access to essential rooms)",Disabled access needs a) Fully wheelchair-accessible housing,Disabled access needs b) Wheelchair access to essential rooms,Disabled access needs c) Level access housing,Disabled access needs f) Other disabled access needs,Disabled access needs g) No disabled access needs,Disabled access needs h) Don't know,Do they have any other disabled access needs?,Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?,Does this person's condition affect their dexterity?,Does this person's condition affect their learning or understanding or concentrating?,Does this person's condition affect their hearing?,Does this person's condition affect their memory?,Does this person's condition affect their mental health?,Does this person's condition affect their mobility?,Does this person's condition affect them socially or behaviourally?,Does this person's condition affect their stamina or breathing or fatigue?,Does this person's condition affect their vision?,Does this person's condition affect them in another way?,How long has the household continuously lived in the local authority area of the new letting?,How long has the household been on the local authority waiting list for the new letting?,What is the tenant's main reason for the household leaving their last settled home?,"If 'Other', what was the main reason for leaving their last settled home?",The soft validation was confirmed,Where was the household immediately before this letting?,Did the household experience homelessness immediately before this letting?,Previous postcode unknown or previous accommodation was temporary,What is the postcode of the household's last settled home?,Was the local authority of the household's last settled home known?,The internal value to indicate if the previous LA was inferred from the postcode,Previous location LA name,Previous location's ONS LA Code,Was the household given reasonable preference by the local authority?,Reasonable preference reason - They were homeless or about to lose their home (within 56 days),"Reasonable preference reason - They were living in insanitary, overcrowded or unisatisfactory housing",Reasonable preference reason - They needed to move on medical and welfare reasons (including disability),Reasonable preference reason - They needed to move to avoid hardship to themselves or others,Reasonable preference reason - Don't Know,Was the letting made under Choice-Based Lettings (CBL)?,Was the letting made under the Common Allocation Policy (CAP)?,Was the letting made under the Common Housing Register (CHR)?,Was the letting made under the Accessible Register?,"The letting was not allocated under CBL, CAP, CHR or Accessible Register.",What was the source of referral for this letting?,What was the source of referral for this letting?,What was the source of referral for this letting?,Do you know the household's combined income after tax?,Was the household income refused?,How often does the household receive income?,How much income does the household have in total?,Populated when someone hits the soft validation and confirmed in the service,Is the tenant likely to be receiving any of these housing-related benefits?,"Does the tenant receive housing-related benefits? Yes if hb = Universal Credit housing element or Housing benefit, No if hb =  Don't Know, Neither, Tenant prefers not to say or blank","How much of the household's income is from Universal Credit, state pensions or benefits?",Does the household pay rent or other charges for the accommodation?,Does the household pay rent or other charges for the accommodation? - flag for when household_charge is answered no,How often does the household pay rent and other charges?,What is the basic rent?,Weekly rent,Populated when the soft validation and confirmed in the service,What is the service charge?,Weekly service charge,What is the personal service charge?,Weekly personal service charge,What is the support charge?,Weekly support charge,Total charge to the tenant,Weekly total charge to the tenant,Populated when the soft validation and confirmed in the service,Populated when the soft validation and confirmed in the service,Populated when the soft validation and confirmed in the service,"After the household has received any housing-related benefits, will they still need to pay for rent and charges?",Can you estimate the outstanding amount?,Estimated outstanding amount,Weekly total rent shortfall charge for tenant receiving housing benefit,What scheme does this letting belong to?,"From scheme code, we map to the scheme name",Does the scheme contain confidential information?,"What is this type of scheme? (Direct access hostel), Foyer, Housing for older people or Other supported housing",Is this scheme registered under the Care Standards Act 2000?,Which organisation owns the housing stock for this scheme?,What client group is this scheme intended for?,Does this scheme provide for another client group?,What is the other client group?,What support does this scheme provide?,Intended length of stay,Date scheme was created,Which location is this letting for?,What is the postcode for this location?,What is the name of this location?,How many units are at this location?,What is the most common type of unit at this location?,What are the mobility standards for the majority of the units in this location?,What is the local authority of this postcode?,When did the first property in this location become available under this scheme?
+id,status,duplicate_set_id,created_by,assigned_to,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,bulk_upload_id,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,declaration,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,uprn,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,uprn_known,uprn_selection,address_search_value_check,address_line1_input,postcode_full_input,address_line1_as_entered,address_line2_as_entered,town_or_city_as_entered,county_as_entered,postcode_full_as_entered,la_as_entered,unittype_gn,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,sheltered,joint,startertenancy,tenancy,tenancyother,tenancyother_value_check,tenancylength,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sexrab1,gender_same_as_sex1,gender_description1,ethnic_group,ethnic,nationality_all,ecstat1,working_situation_illness_check,details_known_2,age2,relat2,multiple_partners_value_check,sexrab2,gender_same_as_sex2,gender_description2,ecstat2,details_known_3,age3,relat3,sexrab3,gender_same_as_sex3,gender_description3,ecstat3,details_known_4,age4,relat4,sexrab4,gender_same_as_sex4,gender_description4,ecstat4,details_known_5,age5,relat5,sexrab5,gender_same_as_sex5,gender_description5,ecstat5,details_known_6,age6,relat6,sexrab6,gender_same_as_sex6,gender_description6,ecstat6,details_known_7,age7,relat7,sexrab7,gender_same_as_sex7,gender_description7,ecstat7,details_known_8,age8,relat8,sexrab8,gender_same_as_sex8,gender_description8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,reasonother_value_check,prevten,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,accessible_register,letting_allocation_none,referral_register,referral_noms,referral_org,net_income_known,incref,incfreq,earnings,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_confidential,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
+,in_progress,,s.port@jeemayle.com,s.port@jeemayle.com,false,2026-04-01T00:00:00+01:00,,2026-04-01T00:00:00+01:00,1,2026,,MHCLG,MHCLG,1,7,0,2026-04-01,2,2,,,2,HIJKLMN,ABCDEFG,1,0,2,6,2,,Address line 1,,London,,NW9 5LL,false,Barnet,E09000003,0,,,,,address line 1 as entered,address line 2 as entered,town or city as entered,county as entered,AB1 2CD,la as entered,7,1,3,2026-03-30,1,,1,2026-03-31,,,3,1,4,,,2,4,,1,4,0,0,2,35,,F,1,,0,2,36,0,,0,32,P,,M,2,Non-binary,6,1,-9,R,R,3,,10,0,-9,R,R,3,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,,6,1,0,TN23 6LZ,1,false,Ashford,E07000105,1,0,1,0,0,0,0,0,1,0,0,1,,,0,0,1,268,,6,1,1,,,2,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,1,0,12.0,6.0,,,,,,,,,,,,,,,,,,,,
diff --git a/spec/fixtures/files/lettings_log_csv_export_labels_26.csv b/spec/fixtures/files/lettings_log_csv_export_labels_26.csv
index 5a24e5c31..eb7cfd35c 100644
--- a/spec/fixtures/files/lettings_log_csv_export_labels_26.csv
+++ b/spec/fixtures/files/lettings_log_csv_export_labels_26.csv
@@ -1,3 +1,3 @@
-Log ID,Status of log,ID of a set of duplicate logs,User the log is created by,User the log is assigned to,Is the user in the assigned_to column the data protection officer?,Time and date the log was created,User who last updated the log,Time and date the log was last updated,Was the log submitted in-service or via bulk upload?,Year collection period opened,ID of a set of bulk uploaded logs,Which organisation owns this property?,Which organisation manages this letting?,What is the needs type?,What is the letting type?,Is this letting a renewal?,What is the tenancy start date?,"What is the rent type? (grouped into SR, IR or AR)",What is the rent type?,Which type of Intermediate Rent is this letting?,Which 'Other' type of Intermediate Rent is this letting?,Is this a London Affordable Rent letting?,What is the tenant code?,What is the property reference?,Has the tenant seen the MHCLG privacy notice?,Is this the first time the property has been let as social housing?,What rent product was the property most recently let as?,What is the reason for the property being vacant?,Is this property new to the social rented sector?,"If known, property's UPRN",Address line 1,Address line 2,Town or City,County,Postcode,The internal value to indicate if the LA was inferred from the postcode,What is the property's local authority?,Local authority code,Is the UPRN known?,UPRN of the address selected,Was the 'No address found' page seen?,Address line 1 input from address matching feature,Postcode input from address matching feature,Address line 1 entered in bulk upload file,Address line 2 entered in bulk upload file,Town or city entered in bulk upload file,County entered in bulk upload file,Postcode entered in bulk upload file,Local authority entered in bulk upload file,What type of unit is the property?,Is the property built or adapted to wheelchair-user standards?,How many bedrooms does the property have?,What is the void date?,Number of days the property was vacant,The following soft validation was confirmed: You told us that the property has been vacant for more than 2 years. This is higher than we would expect.,Were any major repairs carried out during the void period?,What date were any major repairs completed on?,The following soft validation was confirmed: You told us the property has been vacant for 2 years. This is higher than we would expect.,Is this letting in sheltered accommodation?,Is this a joint tenancy?,Is this a starter tenancy?,What is the type of tenancy?,"If 'Other', what is the type of tenancy?",What is the length of the fixed-term tenancy to the nearest year?,How many people live in the household at this letting?,The following soft validation was confirmed: You told us somebody in the household is pregnant. You also told us there are no female tenants living at the property.,"Where household characteristics have a 'Refused' option for some or all of: AGE1-AGE8, SEX1-SEX8, RELAT2-RELAT8, ECSTAT1-ECSTAT8","Type of household 1 = 1 elder; 2 = 2 adults, including elder(s); 3 = 1 adult; 4 = 2 adults; 5 = 1 adult & 1+ children; 6 = 2+ adults & 1+ children; 9 = Other",Total number of dependent children in the household (Sum of when RELAT2-8 = C),Total number of elders in household (Sum of when AGE1-8 >= 60),Total number of adults in household,What is the lead tenant's age?,The following soft validation was confirmed: You told us this person is aged %{age} years and retired. The minimum expected retirement age for %{gender} in England is %{age}.,What was the lead tenant's sex at birth?,Is the gender the lead tenant identifies with the same as their sex registered at birth?,"If 'No', enter the lead tenant's gender identity",What is the lead tenant's ethnic group?,Which of these best describes the lead tenant's ethnic background?,What is the lead tenant's nationality?,Which of these best describes the lead tenant's working situation?,The following soft validation was confirmed: You have said that at least one person's situation is 'Unable to work because of long-term sickness or disability'.,Are the details of tenant 2 known?,What is person 2's age?,What is person 2's relationship to the lead tenant?,The following soft validation was confirmed: You said that more than one person in the household is the partner of the lead tenant. Are you sure this is correct?,What was person 2's sex at birth?,Is the gender person 2 identifies with the same as their sex registered at birth?,"If 'No', enter person 2's gender identity",Which of these best describes person 2's working situation?,Are the details of tenant 3 known?,What is person 3's age?,What is person 3's relationship to the lead tenant?,What was person 3's sex at birth?,Is the gender person 3 identifies with the same as their sex registered at birth?,"If 'No', enter person 3's gender identity",Which of these best describes person 3's working situation?,Are the details of tenant 4 known?,What is person 4's age?,What is person 4's relationship to the lead tenant?,What was person 4's sex at birth?,Is the gender person 4 identifies with the same as their sex registered at birth?,"If 'No', enter person 4's gender identity",Which of these best describes person 4's working situation?,Are the details of tenant 5 known?,What is person 5's age?,What is person 5's relationship to the lead tenant?,What was person 5's sex at birth?,Is the gender person 5 identifies with the same as their sex registered at birth?,"If 'No', enter person 5's gender identity",Which of these best describes person 5's working situation?,Are the details of tenant 6 known?,What is person 6's age?,What is person 6's relationship to the lead tenant?,What was person 6's sex at birth?,Is the gender person 6 identifies with the same as their sex registered at birth?,"If 'No', enter person 6's gender identity",Which of these best describes person 6's working situation?,Are the details of tenant 7 known?,What is person 7's age?,What is person 7's relationship to the lead tenant?,What was person 7's sex at birth?,Is the gender person 7 identifies with the same as their sex registered at birth?,"If 'No', enter person 7's gender identity",Which of these best describes person 7's working situation?,Are the details of tenant 8 known?,What is person 8's age?,What is person 8's relationship to the lead tenant?,What was person 8's sex at birth?,Is the gender person 8 identifies with the same as their sex registered at birth?,"If 'No', enter person 8's gender identity",Which of these best describes person 8's working situation?,Does anybody in the household have links to the UK armed forces?,Is this person still serving in the UK armed forces?,Was this person seriously injured or ill as a result of serving in the UK armed forces?,Is anybody in the household pregnant?,Does anybody in the household have any disabled access needs?,"What access needs do they have? (Fully wheelchair-accessible housing, Level access housing or Wheelchair access to essential rooms)",Disabled access needs a) Fully wheelchair-accessible housing,Disabled access needs b) Wheelchair access to essential rooms,Disabled access needs c) Level access housing,Disabled access needs f) Other disabled access needs,Disabled access needs g) No disabled access needs,Disabled access needs h) Don't know,Do they have any other disabled access needs?,Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?,Does this person's condition affect their dexterity?,Does this person's condition affect their learning or understanding or concentrating?,Does this person's condition affect their hearing?,Does this person's condition affect their memory?,Does this person's condition affect their mental health?,Does this person's condition affect their mobility?,Does this person's condition affect them socially or behaviourally?,Does this person's condition affect their stamina or breathing or fatigue?,Does this person's condition affect their vision?,Does this person's condition affect them in another way?,How long has the household continuously lived in the local authority area of the new letting?,How long has the household been on the local authority waiting list for the new letting?,What is the tenant's main reason for the household leaving their last settled home?,"If 'Other', what was the main reason for leaving their last settled home?",The soft validation was confirmed,Where was the household immediately before this letting?,Did the household experience homelessness immediately before this letting?,Previous postcode unknown or previous accommodation was temporary,What is the postcode of the household's last settled home?,Was the local authority of the household's last settled home known?,The internal value to indicate if the previous LA was inferred from the postcode,Previous location LA name,Previous location's ONS LA Code,Was the household given reasonable preference by the local authority?,Reasonable preference reason - They were homeless or about to lose their home (within 56 days),"Reasonable preference reason - They were living in insanitary, overcrowded or unisatisfactory housing",Reasonable preference reason - They needed to move on medical and welfare reasons (including disability),Reasonable preference reason - They needed to move to avoid hardship to themselves or others,Reasonable preference reason - Don't Know,Was the letting made under Choice-Based Lettings (CBL)?,Was the letting made under the Common Allocation Policy (CAP)?,Was the letting made under the Common Housing Register (CHR)?,Was the letting made under the Accessible Register?,"The letting was not allocated under CBL, CAP, CHR or Accessible Register.",What was the source of referral for this letting?,What was the source of referral for this letting?,What was the source of referral for this letting?,Do you know the household's combined income after tax?,Was the household income refused?,How often does the household receive income?,How much income does the household have in total?,Populated when someone hits the soft validation and confirmed in the service,Is the tenant likely to be receiving any of these housing-related benefits?,"Does the tenant receive housing-related benefits? Yes if hb = Universal Credit housing element or Housing benefit, No if hb =  Don't Know, Neither, Tenant prefers not to say or blank","How much of the household's income is from Universal Credit, state pensions or benefits?",Does the household pay rent or other charges for the accommodation?,Does the household pay rent or other charges for the accommodation? - flag for when household_charge is answered no,How often does the household pay rent and other charges?,What is the basic rent?,Weekly rent,Populated when the soft validation and confirmed in the service,What is the service charge?,Weekly service charge,What is the personal service charge?,Weekly personal service charge,What is the support charge?,Weekly support charge,Total charge to the tenant,Weekly total charge to the tenant,Populated when the soft validation and confirmed in the service,Populated when the soft validation and confirmed in the service,Populated when the soft validation and confirmed in the service,"After the household has received any housing-related benefits, will they still need to pay for rent and charges?",Can you estimate the outstanding amount?,Estimated outstanding amount,Weekly total rent shortfall charge for tenant receiving housing benefit,What scheme does this letting belong to?,"From scheme code, we map to the scheme name",Does the scheme contain confidential information?,"What is this type of scheme? (Direct access hostel), Foyer, Housing for older people or Other supported housing",Is this scheme registered under the Care Standards Act 2000?,Which organisation owns the housing stock for this scheme?,What client group is this scheme intended for?,Does this scheme provide for another client group?,What is the other client group?,What support does this scheme provide?,Intended length of stay,Date scheme was created,Which location is this letting for?,What is the postcode for this location?,What is the name of this location?,How many units are at this location?,What is the most common type of unit at this location?,What are the mobility standards for the majority of the units in this location?,What is the local authority of this postcode?,When did the first property in this location become available under this scheme?
-id,status,duplicate_set_id,created_by,assigned_to,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,bulk_upload_id,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,declaration,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,uprn,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,uprn_known,uprn_selection,address_search_value_check,address_line1_input,postcode_full_input,address_line1_as_entered,address_line2_as_entered,town_or_city_as_entered,county_as_entered,postcode_full_as_entered,la_as_entered,unittype_gn,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,sheltered,joint,startertenancy,tenancy,tenancyother,tenancylength,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sexrab1,gender_same_as_sex1,gender_description1,ethnic_group,ethnic,nationality_all,ecstat1,working_situation_illness_check,details_known_2,age2,relat2,multiple_partners_value_check,sexrab2,gender_same_as_sex2,gender_description2,ecstat2,details_known_3,age3,relat3,sexrab3,gender_same_as_sex3,gender_description3,ecstat3,details_known_4,age4,relat4,sexrab4,gender_same_as_sex4,gender_description4,ecstat4,details_known_5,age5,relat5,sexrab5,gender_same_as_sex5,gender_description5,ecstat5,details_known_6,age6,relat6,sexrab6,gender_same_as_sex6,gender_description6,ecstat6,details_known_7,age7,relat7,sexrab7,gender_same_as_sex7,gender_description7,ecstat7,details_known_8,age8,relat8,sexrab8,gender_same_as_sex8,gender_description8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,reasonother_value_check,prevten,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,accessible_register,letting_allocation_none,referral_register,referral_noms,referral_org,net_income_known,incref,incfreq,earnings,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_confidential,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
-,in_progress,,s.port@jeemayle.com,s.port@jeemayle.com,false,2026-04-01T00:00:00+01:00,,2026-04-01T00:00:00+01:00,single log,2026,,MHCLG,MHCLG,General needs,Affordable rent general needs local authority,No,2026-04-01,Affordable Rent,Affordable Rent,,,No,HIJKLMN,ABCDEFG,Yes,No,Affordable rent basis,Tenant abandoned property,No,,Address line 1,,London,,NW9 5LL,No,Barnet,E09000003,No,,,,,address line 1 as entered,address line 2 as entered,town or city as entered,county as entered,AB1 2CD,la as entered,House,Yes,3,2026-03-30,1,,Yes,2026-03-31,,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,2,4,,Yes,4,0,0,2,35,,Female,Yes,,White,Irish,Australia,Other,,Yes,32,Yes,,Male,"No, enter gender identity",Non-binary,Not seeking work,No,Not known,Prefers not to say,Prefers not to say,Prefers not to say,,Prefers not to say,Yes,Not known,Tenant prefers not to say,Prefers not to say,Prefers not to say,,Person prefers not to say,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,Yes,No,No,No,No,No,No,Yes,No,No,Yes,No,No,No,No,No,No,No,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,,Other supported housing,No,Yes,TN23 6LZ,Yes,No,Ashford,E07000105,Yes,,Yes,,,,No,No,Yes,No,No,Renewal to the same tenant in the same property,,,Yes,No,Weekly,268,,Universal Credit housing element,Yes,All,,,Every 2 weeks,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,Yes,Yes,12.0,6.0,,,,,,,,,,,,,,,,,,,,
+Log ID,Status of log,ID of a set of duplicate logs,User the log is created by,User the log is assigned to,Is the user in the assigned_to column the data protection officer?,Time and date the log was created,User who last updated the log,Time and date the log was last updated,Was the log submitted in-service or via bulk upload?,Year collection period opened,ID of a set of bulk uploaded logs,Which organisation owns this property?,Which organisation manages this letting?,What is the needs type?,What is the letting type?,Is this letting a renewal?,What is the tenancy start date?,"What is the rent type? (grouped into SR, IR or AR)",What is the rent type?,Which type of Intermediate Rent is this letting?,Which 'Other' type of Intermediate Rent is this letting?,Is this a London Affordable Rent letting?,What is the tenant code?,What is the property reference?,Has the tenant seen the MHCLG privacy notice?,Is this the first time the property has been let as social housing?,What rent product was the property most recently let as?,What is the reason for the property being vacant?,Is this property new to the social rented sector?,"If known, property's UPRN",Address line 1,Address line 2,Town or City,County,Postcode,The internal value to indicate if the LA was inferred from the postcode,What is the property's local authority?,Local authority code,Is the UPRN known?,UPRN of the address selected,Was the 'No address found' page seen?,Address line 1 input from address matching feature,Postcode input from address matching feature,Address line 1 entered in bulk upload file,Address line 2 entered in bulk upload file,Town or city entered in bulk upload file,County entered in bulk upload file,Postcode entered in bulk upload file,Local authority entered in bulk upload file,What type of unit is the property?,Is the property built or adapted to wheelchair-user standards?,How many bedrooms does the property have?,What is the void date?,Number of days the property was vacant,The following soft validation was confirmed: You told us that the property has been vacant for more than 2 years. This is higher than we would expect.,Were any major repairs carried out during the void period?,What date were any major repairs completed on?,The following soft validation was confirmed: You told us the property has been vacant for 2 years. This is higher than we would expect.,Is this letting in sheltered accommodation?,Is this a joint tenancy?,Is this a starter tenancy?,What is the type of tenancy?,"If 'Other', what is the type of tenancy?",,What is the length of the fixed-term tenancy to the nearest year?,How many people live in the household at this letting?,The following soft validation was confirmed: You told us somebody in the household is pregnant. You also told us there are no female tenants living at the property.,"Where household characteristics have a 'Refused' option for some or all of: AGE1-AGE8, SEX1-SEX8, RELAT2-RELAT8, ECSTAT1-ECSTAT8","Type of household 1 = 1 elder; 2 = 2 adults, including elder(s); 3 = 1 adult; 4 = 2 adults; 5 = 1 adult & 1+ children; 6 = 2+ adults & 1+ children; 9 = Other",Total number of dependent children in the household (Sum of when RELAT2-8 = C),Total number of elders in household (Sum of when AGE1-8 >= 60),Total number of adults in household,What is the lead tenant's age?,The following soft validation was confirmed: You told us this person is aged %{age} years and retired. The minimum expected retirement age for %{gender} in England is %{age}.,What was the lead tenant's sex at birth?,Is the gender the lead tenant identifies with the same as their sex registered at birth?,"If 'No', enter the lead tenant's gender identity",What is the lead tenant's ethnic group?,Which of these best describes the lead tenant's ethnic background?,What is the lead tenant's nationality?,Which of these best describes the lead tenant's working situation?,The following soft validation was confirmed: You have said that at least one person's situation is 'Unable to work because of long-term sickness or disability'.,Are the details of tenant 2 known?,What is person 2's age?,What is person 2's relationship to the lead tenant?,The following soft validation was confirmed: You said that more than one person in the household is the partner of the lead tenant. Are you sure this is correct?,What was person 2's sex at birth?,Is the gender person 2 identifies with the same as their sex registered at birth?,"If 'No', enter person 2's gender identity",Which of these best describes person 2's working situation?,Are the details of tenant 3 known?,What is person 3's age?,What is person 3's relationship to the lead tenant?,What was person 3's sex at birth?,Is the gender person 3 identifies with the same as their sex registered at birth?,"If 'No', enter person 3's gender identity",Which of these best describes person 3's working situation?,Are the details of tenant 4 known?,What is person 4's age?,What is person 4's relationship to the lead tenant?,What was person 4's sex at birth?,Is the gender person 4 identifies with the same as their sex registered at birth?,"If 'No', enter person 4's gender identity",Which of these best describes person 4's working situation?,Are the details of tenant 5 known?,What is person 5's age?,What is person 5's relationship to the lead tenant?,What was person 5's sex at birth?,Is the gender person 5 identifies with the same as their sex registered at birth?,"If 'No', enter person 5's gender identity",Which of these best describes person 5's working situation?,Are the details of tenant 6 known?,What is person 6's age?,What is person 6's relationship to the lead tenant?,What was person 6's sex at birth?,Is the gender person 6 identifies with the same as their sex registered at birth?,"If 'No', enter person 6's gender identity",Which of these best describes person 6's working situation?,Are the details of tenant 7 known?,What is person 7's age?,What is person 7's relationship to the lead tenant?,What was person 7's sex at birth?,Is the gender person 7 identifies with the same as their sex registered at birth?,"If 'No', enter person 7's gender identity",Which of these best describes person 7's working situation?,Are the details of tenant 8 known?,What is person 8's age?,What is person 8's relationship to the lead tenant?,What was person 8's sex at birth?,Is the gender person 8 identifies with the same as their sex registered at birth?,"If 'No', enter person 8's gender identity",Which of these best describes person 8's working situation?,Does anybody in the household have links to the UK armed forces?,Is this person still serving in the UK armed forces?,Was this person seriously injured or ill as a result of serving in the UK armed forces?,Is anybody in the household pregnant?,Does anybody in the household have any disabled access needs?,"What access needs do they have? (Fully wheelchair-accessible housing, Level access housing or Wheelchair access to essential rooms)",Disabled access needs a) Fully wheelchair-accessible housing,Disabled access needs b) Wheelchair access to essential rooms,Disabled access needs c) Level access housing,Disabled access needs f) Other disabled access needs,Disabled access needs g) No disabled access needs,Disabled access needs h) Don't know,Do they have any other disabled access needs?,Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?,Does this person's condition affect their dexterity?,Does this person's condition affect their learning or understanding or concentrating?,Does this person's condition affect their hearing?,Does this person's condition affect their memory?,Does this person's condition affect their mental health?,Does this person's condition affect their mobility?,Does this person's condition affect them socially or behaviourally?,Does this person's condition affect their stamina or breathing or fatigue?,Does this person's condition affect their vision?,Does this person's condition affect them in another way?,How long has the household continuously lived in the local authority area of the new letting?,How long has the household been on the local authority waiting list for the new letting?,What is the tenant's main reason for the household leaving their last settled home?,"If 'Other', what was the main reason for leaving their last settled home?",The soft validation was confirmed,Where was the household immediately before this letting?,Did the household experience homelessness immediately before this letting?,Previous postcode unknown or previous accommodation was temporary,What is the postcode of the household's last settled home?,Was the local authority of the household's last settled home known?,The internal value to indicate if the previous LA was inferred from the postcode,Previous location LA name,Previous location's ONS LA Code,Was the household given reasonable preference by the local authority?,Reasonable preference reason - They were homeless or about to lose their home (within 56 days),"Reasonable preference reason - They were living in insanitary, overcrowded or unisatisfactory housing",Reasonable preference reason - They needed to move on medical and welfare reasons (including disability),Reasonable preference reason - They needed to move to avoid hardship to themselves or others,Reasonable preference reason - Don't Know,Was the letting made under Choice-Based Lettings (CBL)?,Was the letting made under the Common Allocation Policy (CAP)?,Was the letting made under the Common Housing Register (CHR)?,Was the letting made under the Accessible Register?,"The letting was not allocated under CBL, CAP, CHR or Accessible Register.",What was the source of referral for this letting?,What was the source of referral for this letting?,What was the source of referral for this letting?,Do you know the household's combined income after tax?,Was the household income refused?,How often does the household receive income?,How much income does the household have in total?,Populated when someone hits the soft validation and confirmed in the service,Is the tenant likely to be receiving any of these housing-related benefits?,"Does the tenant receive housing-related benefits? Yes if hb = Universal Credit housing element or Housing benefit, No if hb =  Don't Know, Neither, Tenant prefers not to say or blank","How much of the household's income is from Universal Credit, state pensions or benefits?",Does the household pay rent or other charges for the accommodation?,Does the household pay rent or other charges for the accommodation? - flag for when household_charge is answered no,How often does the household pay rent and other charges?,What is the basic rent?,Weekly rent,Populated when the soft validation and confirmed in the service,What is the service charge?,Weekly service charge,What is the personal service charge?,Weekly personal service charge,What is the support charge?,Weekly support charge,Total charge to the tenant,Weekly total charge to the tenant,Populated when the soft validation and confirmed in the service,Populated when the soft validation and confirmed in the service,Populated when the soft validation and confirmed in the service,"After the household has received any housing-related benefits, will they still need to pay for rent and charges?",Can you estimate the outstanding amount?,Estimated outstanding amount,Weekly total rent shortfall charge for tenant receiving housing benefit,What scheme does this letting belong to?,"From scheme code, we map to the scheme name",Does the scheme contain confidential information?,"What is this type of scheme? (Direct access hostel), Foyer, Housing for older people or Other supported housing",Is this scheme registered under the Care Standards Act 2000?,Which organisation owns the housing stock for this scheme?,What client group is this scheme intended for?,Does this scheme provide for another client group?,What is the other client group?,What support does this scheme provide?,Intended length of stay,Date scheme was created,Which location is this letting for?,What is the postcode for this location?,What is the name of this location?,How many units are at this location?,What is the most common type of unit at this location?,What are the mobility standards for the majority of the units in this location?,What is the local authority of this postcode?,When did the first property in this location become available under this scheme?
+id,status,duplicate_set_id,created_by,assigned_to,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,bulk_upload_id,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,declaration,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,uprn,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,uprn_known,uprn_selection,address_search_value_check,address_line1_input,postcode_full_input,address_line1_as_entered,address_line2_as_entered,town_or_city_as_entered,county_as_entered,postcode_full_as_entered,la_as_entered,unittype_gn,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,sheltered,joint,startertenancy,tenancy,tenancyother,tenancyother_value_check,tenancylength,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sexrab1,gender_same_as_sex1,gender_description1,ethnic_group,ethnic,nationality_all,ecstat1,working_situation_illness_check,details_known_2,age2,relat2,multiple_partners_value_check,sexrab2,gender_same_as_sex2,gender_description2,ecstat2,details_known_3,age3,relat3,sexrab3,gender_same_as_sex3,gender_description3,ecstat3,details_known_4,age4,relat4,sexrab4,gender_same_as_sex4,gender_description4,ecstat4,details_known_5,age5,relat5,sexrab5,gender_same_as_sex5,gender_description5,ecstat5,details_known_6,age6,relat6,sexrab6,gender_same_as_sex6,gender_description6,ecstat6,details_known_7,age7,relat7,sexrab7,gender_same_as_sex7,gender_description7,ecstat7,details_known_8,age8,relat8,sexrab8,gender_same_as_sex8,gender_description8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,reasonother_value_check,prevten,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,accessible_register,letting_allocation_none,referral_register,referral_noms,referral_org,net_income_known,incref,incfreq,earnings,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_confidential,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
+,in_progress,,s.port@jeemayle.com,s.port@jeemayle.com,false,2026-04-01T00:00:00+01:00,,2026-04-01T00:00:00+01:00,single log,2026,,MHCLG,MHCLG,General needs,Affordable rent general needs local authority,No,2026-04-01,Affordable Rent,Affordable Rent,,,No,HIJKLMN,ABCDEFG,Yes,No,Affordable rent basis,Tenant abandoned property,No,,Address line 1,,London,,NW9 5LL,No,Barnet,E09000003,No,,,,,address line 1 as entered,address line 2 as entered,town or city as entered,county as entered,AB1 2CD,la as entered,House,Yes,3,2026-03-30,1,,Yes,2026-03-31,,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,,2,4,,Yes,4,0,0,2,35,,Female,Yes,,White,Irish,Australia,Other,,Yes,32,Yes,,Male,"No, enter gender identity",Non-binary,Not seeking work,No,Not known,Prefers not to say,Prefers not to say,Prefers not to say,,Prefers not to say,Yes,Not known,Tenant prefers not to say,Prefers not to say,Prefers not to say,,Person prefers not to say,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,Yes,No,No,No,No,No,No,Yes,No,No,Yes,No,No,No,No,No,No,No,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,,Other supported housing,No,Yes,TN23 6LZ,Yes,No,Ashford,E07000105,Yes,,Yes,,,,No,No,Yes,No,No,Renewal to the same tenant in the same property,,,Yes,No,Weekly,268,,Universal Credit housing element,Yes,All,,,Every 2 weeks,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,Yes,Yes,12.0,6.0,,,,,,,,,,,,,,,,,,,,
diff --git a/spec/helpers/collection_resources_helper_spec.rb b/spec/helpers/collection_resources_helper_spec.rb
index a146e43cc..b2b553b83 100644
--- a/spec/helpers/collection_resources_helper_spec.rb
+++ b/spec/helpers/collection_resources_helper_spec.rb
@@ -62,7 +62,7 @@ RSpec.describe CollectionResourcesHelper do
         let(:current_date) { Time.zone.local(2025, 2, 1) }
 
         it "returns current and next years" do
-          expect(editable_collection_resource_years).to match_array([2024, 2025])
+          expect(editable_collection_resource_years).to contain_exactly(2024, 2025)
         end
       end
 
diff --git a/spec/helpers/question_attribute_helper_spec.rb b/spec/helpers/question_attribute_helper_spec.rb
index 9d769cdf6..7ceaf8917 100644
--- a/spec/helpers/question_attribute_helper_spec.rb
+++ b/spec/helpers/question_attribute_helper_spec.rb
@@ -11,12 +11,12 @@ RSpec.describe QuestionAttributeHelper do
   end
 
   describe "html attributes" do
-    it "returns empty hash if fields-to-add or result-field are empty " do
+    it "returns empty hash if fields-to-add or result-field are empty" do
       question = form.get_page("weekly_net_income").questions.find { |q| q.id == "earnings" }
       expect(stimulus_html_attributes(question)).to eq({})
     end
 
-    it "returns html attributes if fields-to-add or result-field are not empty " do
+    it "returns html attributes if fields-to-add or result-field are not empty" do
       brent = questions.find { |q| q.id == "brent" }
       expect(stimulus_html_attributes(brent)).to eq({
         "data-controller": "numeric-question",
diff --git a/spec/helpers/tag_helper_spec.rb b/spec/helpers/tag_helper_spec.rb
index 1a6c75724..c6c909cb7 100644
--- a/spec/helpers/tag_helper_spec.rb
+++ b/spec/helpers/tag_helper_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe TagHelper do
 
     it "returns tag with correct status text and colour and custom class" do
       expect(status_tag("not_started", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--light-blue app-tag--small\">Not started</strong>")
-      expect(status_tag("cannot_start_yet", "app-tag--small")).to eq(nil)
+      expect(status_tag("cannot_start_yet", "app-tag--small")).to be_nil
       expect(status_tag("in_progress", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--blue app-tag--small\">In progress</strong>")
       expect(status_tag("completed", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--green app-tag--small\">Completed</strong>")
       expect(status_tag("active", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--green app-tag--small\">Active</strong>")
diff --git a/spec/helpers/tasklist_helper_spec.rb b/spec/helpers/tasklist_helper_spec.rb
index dc683c7b2..512645dfe 100644
--- a/spec/helpers/tasklist_helper_spec.rb
+++ b/spec/helpers/tasklist_helper_spec.rb
@@ -17,8 +17,8 @@ RSpec.describe TasklistHelper do
     end
 
     describe "get sections count" do
-      let(:completed_subsection) { instance_double("Subsection", status: :completed, displayed_in_tasklist?: true, applicable_questions: [{ id: "question" }]) }
-      let(:incomplete_subsection) { instance_double("Subsection", status: :not_started, displayed_in_tasklist?: true, applicable_questions: []) }
+      let(:completed_subsection) { instance_double(Form::Subsection, status: :completed, displayed_in_tasklist?: true, applicable_questions: [{ id: "question" }]) }
+      let(:incomplete_subsection) { instance_double(Form::Subsection, status: :not_started, displayed_in_tasklist?: true, applicable_questions: []) }
 
       context "with an empty lettings log" do
         before do
@@ -79,8 +79,8 @@ RSpec.describe TasklistHelper do
   describe "with sales" do
     let(:empty_sales_log) { build(:sales_log, owning_organisation: nil) }
     let(:completed_sales_log) { build(:sales_log, :completed) }
-    let(:completed_subsection) { instance_double("Subsection", status: :completed, displayed_in_tasklist?: true, applicable_questions: [{ id: "question" }]) }
-    let(:incomplete_subsection) { instance_double("Subsection", status: :not_started, displayed_in_tasklist?: true, applicable_questions: []) }
+    let(:completed_subsection) { instance_double(Form::Subsection, status: :completed, displayed_in_tasklist?: true, applicable_questions: [{ id: "question" }]) }
+    let(:incomplete_subsection) { instance_double(Form::Subsection, status: :not_started, displayed_in_tasklist?: true, applicable_questions: []) }
 
     describe "get sections count" do
       context "with an empty sales log" do
diff --git a/spec/jobs/process_merge_request_job_spec.rb b/spec/jobs/process_merge_request_job_spec.rb
index 4e73b2913..73db82b46 100644
--- a/spec/jobs/process_merge_request_job_spec.rb
+++ b/spec/jobs/process_merge_request_job_spec.rb
@@ -31,7 +31,7 @@ describe ProcessMergeRequestJob do
       let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: organisation, merge_date: Time.zone.local(2022, 3, 3), existing_absorbing_organisation: false) }
 
       it "calls the merge organisations service with correct arguments" do
-        expect(Merge::MergeOrganisationsService).to receive(:new).with(absorbing_organisation_id: organisation.id, merging_organisation_ids: match_array([merging_organisation.id, other_merging_organisation.id]), merge_date: Time.zone.local(2022, 3, 3), absorbing_organisation_active_from_merge_date: true)
+        expect(Merge::MergeOrganisationsService).to receive(:new).with(absorbing_organisation_id: organisation.id, merging_organisation_ids: contain_exactly(merging_organisation.id, other_merging_organisation.id), merge_date: Time.zone.local(2022, 3, 3), absorbing_organisation_active_from_merge_date: true)
 
         job.perform(merge_request:)
         expect(merge_request.reload.status).to eq("request_merged")
@@ -53,7 +53,7 @@ describe ProcessMergeRequestJob do
 
       merge_request.reload
       expect(merge_request.last_failed_attempt).to be_within(10.seconds).of(Time.zone.now)
-      expect(merge_request.processing).to eq(false)
+      expect(merge_request.processing).to be(false)
       expect(merge_request.total_users).to be_nil
       expect(merge_request.total_schemes).to be_nil
       expect(merge_request.total_managing_agents).to be_nil
diff --git a/spec/lib/tasks/clear_unconfirmed_emails_spec.rb b/spec/lib/tasks/clear_unconfirmed_emails_spec.rb
index 0ff7a3315..ba53a8ac7 100644
--- a/spec/lib/tasks/clear_unconfirmed_emails_spec.rb
+++ b/spec/lib/tasks/clear_unconfirmed_emails_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe "clear_unconfirmed_emails" do
         it "clears unconfirmed_email" do
           task.invoke
 
-          expect(user.reload.unconfirmed_email).to eq(nil)
+          expect(user.reload.unconfirmed_email).to be_nil
         end
       end
 
@@ -28,7 +28,7 @@ RSpec.describe "clear_unconfirmed_emails" do
         it "does not clear unconfirmed_email" do
           task.invoke
 
-          expect(user.reload.unconfirmed_email).not_to eq(nil)
+          expect(user.reload.unconfirmed_email).not_to be_nil
         end
       end
     end
diff --git a/spec/lib/tasks/local_authority_links_import_spec.rb b/spec/lib/tasks/local_authority_links_import_spec.rb
index 443a622cf..0b4e2018c 100644
--- a/spec/lib/tasks/local_authority_links_import_spec.rb
+++ b/spec/lib/tasks/local_authority_links_import_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe "data_import" do
       context "when a record already exists with a matching ids" do
         it "does not create a new link" do
           task.invoke(local_authority_links_file_path)
-          expect { task.invoke(local_authority_links_file_path) }.to change(LocalAuthorityLink, :count).by(0)
+          expect { task.invoke(local_authority_links_file_path) }.not_to change(LocalAuthorityLink, :count)
         end
       end
     end
diff --git a/spec/lib/tasks/set_export_collection_years_spec.rb b/spec/lib/tasks/set_export_collection_years_spec.rb
index 76ff779b0..ed63d8847 100644
--- a/spec/lib/tasks/set_export_collection_years_spec.rb
+++ b/spec/lib/tasks/set_export_collection_years_spec.rb
@@ -31,10 +31,10 @@ RSpec.describe "set_export_collection_years" do
         expect(updated_lettings_export.year).to eq(2023)
 
         expect(organisations_export.reload.collection).to eq("organisations")
-        expect(organisations_export.year).to eq(nil)
+        expect(organisations_export.year).to be_nil
 
         expect(users_export.reload.collection).to eq("users")
-        expect(users_export.year).to eq(nil)
+        expect(users_export.year).to be_nil
       end
     end
   end
diff --git a/spec/lib/tasks/set_sales_managing_organisation_spec.rb b/spec/lib/tasks/set_sales_managing_organisation_spec.rb
index 314dcb19e..8ca3f3485 100644
--- a/spec/lib/tasks/set_sales_managing_organisation_spec.rb
+++ b/spec/lib/tasks/set_sales_managing_organisation_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe "set_sales_managing_organisation" do
       let!(:sales_log) { create(:sales_log, :completed, managing_organisation_id: nil) }
 
       it "updates sales log managing_organisation_id with owning_organisation_id" do
-        expect(sales_log.managing_organisation_id).to eq(nil)
+        expect(sales_log.managing_organisation_id).to be_nil
         expect(sales_log.status).to eq("in_progress")
         task.invoke
         sales_log.reload
@@ -26,17 +26,17 @@ RSpec.describe "set_sales_managing_organisation" do
       it "does not update sales log managing_organisation_id if owning_organisation_id is nil" do
         sales_log.update!(owning_organisation_id: nil)
         expect(sales_log.status).to eq("in_progress")
-        expect(sales_log.managing_organisation_id).to eq(nil)
+        expect(sales_log.managing_organisation_id).to be_nil
         task.invoke
         sales_log.reload
-        expect(sales_log.managing_organisation_id).to eq(nil)
+        expect(sales_log.managing_organisation_id).to be_nil
         expect(sales_log.status).to eq("in_progress")
       end
 
       it "skips validations" do
         sales_log.saledate = Time.zone.local(2021, 3, 3)
         sales_log.save!(validate: false)
-        expect(sales_log.managing_organisation_id).to eq(nil)
+        expect(sales_log.managing_organisation_id).to be_nil
         expect(sales_log.status).to eq("in_progress")
         task.invoke
         sales_log.reload
diff --git a/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb b/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb
index 6c8aa25ed..b6e05a5a1 100644
--- a/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb
+++ b/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb
@@ -188,19 +188,19 @@ RSpec.describe "bulk_update" do
         task.invoke(original_schemes_csv_path, updated_schemes_csv_path)
 
         lettings_log.reload
-        expect(lettings_log.values_updated_at).not_to eq(nil)
+        expect(lettings_log.values_updated_at).not_to be_nil
 
         lettings_log_2.reload
-        expect(lettings_log_2.values_updated_at).to eq(nil)
+        expect(lettings_log_2.values_updated_at).to be_nil
 
         lettings_log_3.reload
-        expect(lettings_log_3.values_updated_at).to eq(nil)
+        expect(lettings_log_3.values_updated_at).to be_nil
 
         lettings_log_4.reload
-        expect(lettings_log_4.values_updated_at).not_to eq(nil)
+        expect(lettings_log_4.values_updated_at).not_to be_nil
 
         lettings_log_5.reload
-        expect(lettings_log_5.values_updated_at).to eq(nil)
+        expect(lettings_log_5.values_updated_at).to be_nil
       end
 
       it "logs the progress of the update" do
@@ -407,19 +407,19 @@ RSpec.describe "bulk_update" do
         task.invoke(original_locations_csv_path, updated_locations_csv_path)
 
         lettings_log.reload
-        expect(lettings_log.values_updated_at).not_to eq(nil)
+        expect(lettings_log.values_updated_at).not_to be_nil
 
         lettings_log_2.reload
-        expect(lettings_log_2.values_updated_at).to eq(nil)
+        expect(lettings_log_2.values_updated_at).to be_nil
 
         lettings_log_3.reload
-        expect(lettings_log_3.values_updated_at).to eq(nil)
+        expect(lettings_log_3.values_updated_at).to be_nil
 
         lettings_log_4.reload
-        expect(lettings_log_4.values_updated_at).not_to eq(nil)
+        expect(lettings_log_4.values_updated_at).not_to be_nil
 
         lettings_log_5.reload
-        expect(lettings_log_5.values_updated_at).to eq(nil)
+        expect(lettings_log_5.values_updated_at).to be_nil
       end
 
       it "logs the progress of the update" do
@@ -588,7 +588,7 @@ RSpec.describe "bulk_update" do
             task.invoke(original_locations_csv_path, updated_locations_csv_path)
             lettings_log.reload
             expect(lettings_log.status).to eq("in_progress")
-            expect(lettings_log.rent_value_check).to eq(nil)
+            expect(lettings_log.rent_value_check).to be_nil
             expect(lettings_log.brent).to eq(100)
             expect(lettings_log.scharge).to eq(50)
             expect(lettings_log.pscharge).to eq(50)
diff --git a/spec/mailers/devise_notify_mailer_spec.rb b/spec/mailers/devise_notify_mailer_spec.rb
index 7a7123be0..22745a072 100644
--- a/spec/mailers/devise_notify_mailer_spec.rb
+++ b/spec/mailers/devise_notify_mailer_spec.rb
@@ -9,9 +9,7 @@ RSpec.describe DeviseNotifyMailer do
     let(:password) { "password" }
     let(:role) { "data_coordinator" }
     let(:bad_request_error) do
-      # rubocop:disable RSpec/VerifiedDoubles
       Notifications::Client::BadRequestError.new(double(code: 200, body: ""))
-      # rubocop:enable RSpec/VerifiedDoubles
     end
 
     before do
@@ -22,8 +20,7 @@ RSpec.describe DeviseNotifyMailer do
 
     context "when the rails environment is staging" do
       before do
-        allow(Rails.env).to receive(:test?).and_return(false)
-        allow(Rails.env).to receive(:staging?).and_return(true)
+        allow(Rails.env).to receive_messages(test?: false, staging?: true)
       end
 
       context "when the email domain is not in the allowlist" do
diff --git a/spec/models/bulk_upload_spec.rb b/spec/models/bulk_upload_spec.rb
index ead0480f5..d4626bc4d 100644
--- a/spec/models/bulk_upload_spec.rb
+++ b/spec/models/bulk_upload_spec.rb
@@ -64,13 +64,13 @@ RSpec.describe BulkUpload, type: :model do
 
     describe ".lettings" do
       it "returns only lettings bulk uploads" do
-        expect(described_class.lettings).to match_array([lettings_bulk_upload_1, lettings_bulk_upload_2])
+        expect(described_class.lettings).to contain_exactly(lettings_bulk_upload_1, lettings_bulk_upload_2)
       end
     end
 
     describe ".sales" do
       it "returns only sales bulk uploads" do
-        expect(described_class.sales).to match_array([sales_bulk_upload_1, sales_bulk_upload_2])
+        expect(described_class.sales).to contain_exactly(sales_bulk_upload_1, sales_bulk_upload_2)
       end
     end
 
diff --git a/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb b/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
index e9c1d5879..ee30031fc 100644
--- a/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Form::Lettings::Pages::CareHomeChargesValueCheck, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   it "has correct questions" do
diff --git a/spec/models/form/lettings/pages/created_by_spec.rb b/spec/models/form/lettings/pages/created_by_spec.rb
index 774b826ee..9b2178442 100644
--- a/spec/models/form/lettings/pages/created_by_spec.rb
+++ b/spec/models/form/lettings/pages/created_by_spec.rb
@@ -12,25 +12,25 @@ RSpec.describe Form::Lettings::Pages::CreatedBy, type: :model do
   describe "#routed_to?" do
     context "when nil" do
       it "is not shown" do
-        expect(page.routed_to?(nil, nil)).to eq(false)
+        expect(page.routed_to?(nil, nil)).to be(false)
       end
     end
 
     context "when support" do
       it "is shown" do
-        expect(page.routed_to?(nil, build(:user, :support))).to eq(true)
+        expect(page.routed_to?(nil, build(:user, :support))).to be(true)
       end
     end
 
     context "when data coordinator" do
       it "is shown" do
-        expect(page.routed_to?(nil, build(:user, :data_coordinator))).to eq(true)
+        expect(page.routed_to?(nil, build(:user, :data_coordinator))).to be(true)
       end
     end
 
     context "when data provider" do
       it "is not shown" do
-        expect(page.routed_to?(nil, build(:user))).to eq(false)
+        expect(page.routed_to?(nil, build(:user))).to be(false)
       end
     end
   end
@@ -52,6 +52,6 @@ RSpec.describe Form::Lettings::Pages::CreatedBy, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb
index 7432b0bda..cfdf945cf 100644
--- a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   it "has correct questions" do
diff --git a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb
index 96570ee09..a9c39bb5d 100644
--- a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   it "has correct questions" do
diff --git a/spec/models/form/lettings/pages/managing_organisation_spec.rb b/spec/models/form/lettings/pages/managing_organisation_spec.rb
index ca4d57642..2a9d6f192 100644
--- a/spec/models/form/lettings/pages/managing_organisation_spec.rb
+++ b/spec/models/form/lettings/pages/managing_organisation_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   describe "#routed_to?" do
@@ -33,7 +33,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
 
     context "when user nil" do
       it "is not shown" do
-        expect(page.routed_to?(log, nil)).to eq(false)
+        expect(page.routed_to?(log, nil)).to be(false)
       end
     end
 
@@ -45,7 +45,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
         let(:log) { create(:lettings_log, owning_organisation: user.organisation) }
 
         it "is shown" do
-          expect(page.routed_to?(log, user)).to eq(true)
+          expect(page.routed_to?(log, user)).to be(true)
         end
       end
 
@@ -54,7 +54,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
         let(:log) { create(:lettings_log, owning_organisation: nil) }
 
         it "is not shown" do
-          expect(page.routed_to?(log, user)).to eq(false)
+          expect(page.routed_to?(log, user)).to be(false)
         end
       end
 
@@ -65,7 +65,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
 
         context "with 0 managing_agents" do
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
         end
 
@@ -76,7 +76,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
 
@@ -92,7 +92,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
       end
@@ -106,7 +106,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
           let(:log) { create(:lettings_log, owning_organisation: user.organisation) }
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
 
@@ -119,7 +119,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
         end
       end
@@ -131,7 +131,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
 
         context "with 0 managing_agents" do
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
         end
 
@@ -142,7 +142,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
 
@@ -158,7 +158,7 @@ RSpec.describe Form::Lettings::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
       end
diff --git a/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb b/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb
index f116cb601..be42822d7 100644
--- a/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Form::Lettings::Pages::MultiplePartnersValueCheck, type: :model d
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   context "with person 1" do
diff --git a/spec/models/form/lettings/pages/no_address_found_spec.rb b/spec/models/form/lettings/pages/no_address_found_spec.rb
index 1825d4d30..25613ac39 100644
--- a/spec/models/form/lettings/pages/no_address_found_spec.rb
+++ b/spec/models/form/lettings/pages/no_address_found_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe Form::Lettings::Pages::NoAddressFound, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has the correct title_text" do
diff --git a/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb b/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb
index 6cf6302f8..cdc91410e 100644
--- a/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCh
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   it "has correct questions" do
diff --git a/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb b/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb
index f986f17d2..08a0c1c3d 100644
--- a/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonValueCheck
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   it "has correct questions" do
diff --git a/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb b/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb
index 168f4ca91..c69291343 100644
--- a/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   context "with person 1" do
diff --git a/spec/models/form/lettings/pages/person_age_spec.rb b/spec/models/form/lettings/pages/person_age_spec.rb
index 2043052fd..89580231b 100644
--- a/spec/models/form/lettings/pages/person_age_spec.rb
+++ b/spec/models/form/lettings/pages/person_age_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Pages::PersonAge, type: :model do
   subject(:page) { described_class.new(nil, page_definition, subsection, person_index:) }
 
   let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: false)) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: false, start_year_2026_or_later?: false, person_question_count: 4)) }
   let(:person_index) { 2 }
 
   it "has correct subsection" do
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::PersonAge, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   context "with person 2" do
diff --git a/spec/models/form/lettings/pages/person_gender_identity_spec.rb b/spec/models/form/lettings/pages/person_gender_identity_spec.rb
index 9bd63037e..9ddd3e906 100644
--- a/spec/models/form/lettings/pages/person_gender_identity_spec.rb
+++ b/spec/models/form/lettings/pages/person_gender_identity_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::PersonGenderIdentity, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   context "with person 2" do
diff --git a/spec/models/form/lettings/pages/person_known_spec.rb b/spec/models/form/lettings/pages/person_known_spec.rb
index 6e6f22f75..7b77c5c0f 100644
--- a/spec/models/form/lettings/pages/person_known_spec.rb
+++ b/spec/models/form/lettings/pages/person_known_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::PersonKnown, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   context "with person 2" do
diff --git a/spec/models/form/lettings/pages/person_lead_partner_spec.rb b/spec/models/form/lettings/pages/person_lead_partner_spec.rb
index 55ee97e1d..edcef9b11 100644
--- a/spec/models/form/lettings/pages/person_lead_partner_spec.rb
+++ b/spec/models/form/lettings/pages/person_lead_partner_spec.rb
@@ -4,7 +4,9 @@ RSpec.describe Form::Lettings::Pages::PersonLeadPartner, type: :model do
   subject(:page) { described_class.new(nil, page_definition, subsection, person_index:) }
 
   let(:page_definition) { nil }
-  let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+  let(:start_year_2026_or_later?) { false }
+  let(:person_question_count) { 4 }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2026_or_later?: start_year_2026_or_later?, person_question_count:) }
   let(:subsection) { instance_double(Form::Subsection, form:) }
   let(:person_index) { 2 }
 
@@ -13,7 +15,7 @@ RSpec.describe Form::Lettings::Pages::PersonLeadPartner, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   context "with person 2" do
@@ -26,9 +28,7 @@ RSpec.describe Form::Lettings::Pages::PersonLeadPartner, type: :model do
     end
 
     context "with start year < 2026", metadata: { year: 25 } do
-      before do
-        allow(form).to receive(:start_year_2026_or_later?).and_return(false)
-      end
+      let(:person_question_count) { 4 }
 
       it "has correct depends_on" do
         expect(page.depends_on).to eq(
@@ -38,9 +38,8 @@ RSpec.describe Form::Lettings::Pages::PersonLeadPartner, type: :model do
     end
 
     context "with start year >= 2026", metadata: { year: 26 } do
-      before do
-        allow(form).to receive(:start_year_2026_or_later?).and_return(true)
-      end
+      let(:start_year_2026_or_later?) { true }
+      let(:person_question_count) { 5 }
 
       it "has correct depends_on" do
         expect(page.depends_on).to eq(
@@ -71,9 +70,7 @@ RSpec.describe Form::Lettings::Pages::PersonLeadPartner, type: :model do
     end
 
     context "with start year < 2026", metadata: { year: 25 } do
-      before do
-        allow(form).to receive(:start_year_2026_or_later?).and_return(false)
-      end
+      let(:person_question_count) { 4 }
 
       it "has correct depends_on" do
         expect(page.depends_on).to eq(
@@ -83,9 +80,8 @@ RSpec.describe Form::Lettings::Pages::PersonLeadPartner, type: :model do
     end
 
     context "with start year >= 2026", metadata: { year: 26 } do
-      before do
-        allow(form).to receive(:start_year_2026_or_later?).and_return(true)
-      end
+      let(:start_year_2026_or_later?) { true }
+      let(:person_question_count) { 5 }
 
       it "has correct depends_on" do
         expect(page.depends_on).to eq(
diff --git a/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb b/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb
index c8a482ee4..3381315ee 100644
--- a/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::PersonOverRetirementValueCheck, type: :mod
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   it "has correct questions" do
diff --git a/spec/models/form/lettings/pages/person_relationship_to_lead_spec.rb b/spec/models/form/lettings/pages/person_relationship_to_lead_spec.rb
index 829d55ad0..43a637cd1 100644
--- a/spec/models/form/lettings/pages/person_relationship_to_lead_spec.rb
+++ b/spec/models/form/lettings/pages/person_relationship_to_lead_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::PersonRelationshipToLead, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   context "with person 2" do
diff --git a/spec/models/form/lettings/pages/person_sex_registered_at_birth_spec.rb b/spec/models/form/lettings/pages/person_sex_registered_at_birth_spec.rb
index 628fe5f30..30feef7b4 100644
--- a/spec/models/form/lettings/pages/person_sex_registered_at_birth_spec.rb
+++ b/spec/models/form/lettings/pages/person_sex_registered_at_birth_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Pages::PersonSexRegisteredAtBirth, type: :model d
   subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
 
   let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2026, 4, 1))) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2026, 4, 1), person_question_count: 5)) }
   let(:person_index) { 1 }
 
   let(:page_id) { "person_2_sex_registered_at_birth" }
diff --git a/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb b/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb
index 6226e0309..a605b6ab9 100644
--- a/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Pages::PersonUnderRetirementValueCheck, type: :mo
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   it "has correct questions" do
diff --git a/spec/models/form/lettings/pages/person_working_situation_spec.rb b/spec/models/form/lettings/pages/person_working_situation_spec.rb
index a88cdcde0..3ca84f968 100644
--- a/spec/models/form/lettings/pages/person_working_situation_spec.rb
+++ b/spec/models/form/lettings/pages/person_working_situation_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Pages::PersonWorkingSituation, type: :model do
   subject(:page) { described_class.new(nil, page_definition, subsection, person_index:) }
 
   let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1))) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2026_or_later?: false, person_question_count: 4)) }
   let(:person_index) { 2 }
 
   before do
@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Pages::PersonWorkingSituation, type: :model do
   end
 
   it "has the correct description" do
-    expect(page.description).to be nil
+    expect(page.description).to be_nil
   end
 
   context "with person 2" do
diff --git a/spec/models/form/lettings/pages/property_reference_spec.rb b/spec/models/form/lettings/pages/property_reference_spec.rb
index 59bd4440e..407f17b62 100644
--- a/spec/models/form/lettings/pages/property_reference_spec.rb
+++ b/spec/models/form/lettings/pages/property_reference_spec.rb
@@ -24,6 +24,6 @@ RSpec.describe Form::Lettings::Pages::PropertyReference, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/pages/referral_noms_hr_spec.rb b/spec/models/form/lettings/pages/referral_noms_hr_spec.rb
index b3cd1e113..9abee864a 100644
--- a/spec/models/form/lettings/pages/referral_noms_hr_spec.rb
+++ b/spec/models/form/lettings/pages/referral_noms_hr_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe Form::Lettings::Pages::ReferralNomsHr, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   context "and log owning organisation is not prp" do
diff --git a/spec/models/form/lettings/pages/referral_noms_la_hr_spec.rb b/spec/models/form/lettings/pages/referral_noms_la_hr_spec.rb
index 91fb8cadb..663e3a544 100644
--- a/spec/models/form/lettings/pages/referral_noms_la_hr_spec.rb
+++ b/spec/models/form/lettings/pages/referral_noms_la_hr_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe Form::Lettings::Pages::ReferralNomsLaHr, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   context "and log owning organisation is not prp" do
diff --git a/spec/models/form/lettings/pages/referral_org_directly_referred_spec.rb b/spec/models/form/lettings/pages/referral_org_directly_referred_spec.rb
index 27e1cfa50..2b67b1097 100644
--- a/spec/models/form/lettings/pages/referral_org_directly_referred_spec.rb
+++ b/spec/models/form/lettings/pages/referral_org_directly_referred_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe Form::Lettings::Pages::ReferralOrgDirectlyReferred, type: :model
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   context "and log owning organisation is not prp" do
diff --git a/spec/models/form/lettings/pages/referral_org_nominated_spec.rb b/spec/models/form/lettings/pages/referral_org_nominated_spec.rb
index 68a0a17f1..121fac18d 100644
--- a/spec/models/form/lettings/pages/referral_org_nominated_spec.rb
+++ b/spec/models/form/lettings/pages/referral_org_nominated_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe Form::Lettings::Pages::ReferralOrgNominated, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   context "and log owning organisation is not prp" do
diff --git a/spec/models/form/lettings/pages/referral_register_la_spec.rb b/spec/models/form/lettings/pages/referral_register_la_spec.rb
index 1f2459cbd..e6d4198d7 100644
--- a/spec/models/form/lettings/pages/referral_register_la_spec.rb
+++ b/spec/models/form/lettings/pages/referral_register_la_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Form::Lettings::Pages::ReferralRegisterLa, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   context "when log is a renewal" do
diff --git a/spec/models/form/lettings/pages/referral_register_prp_spec.rb b/spec/models/form/lettings/pages/referral_register_prp_spec.rb
index bcb48562a..9aee65c9e 100644
--- a/spec/models/form/lettings/pages/referral_register_prp_spec.rb
+++ b/spec/models/form/lettings/pages/referral_register_prp_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Form::Lettings::Pages::ReferralRegisterPrp, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   context "when log is a renewal" do
diff --git a/spec/models/form/lettings/pages/renewal_spec.rb b/spec/models/form/lettings/pages/renewal_spec.rb
index 77ba3aec8..ac236513b 100644
--- a/spec/models/form/lettings/pages/renewal_spec.rb
+++ b/spec/models/form/lettings/pages/renewal_spec.rb
@@ -30,6 +30,6 @@ RSpec.describe Form::Lettings::Pages::Renewal, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/pages/rent_type_spec.rb b/spec/models/form/lettings/pages/rent_type_spec.rb
index 08cd3ef6d..663d39044 100644
--- a/spec/models/form/lettings/pages/rent_type_spec.rb
+++ b/spec/models/form/lettings/pages/rent_type_spec.rb
@@ -10,8 +10,7 @@ RSpec.describe Form::Lettings::Pages::RentType, type: :model do
 
   before do
     allow(subsection).to receive(:form).and_return(form)
-    allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-    allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+    allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false)
   end
 
   it "has correct subsection" do
diff --git a/spec/models/form/lettings/pages/stock_owner_spec.rb b/spec/models/form/lettings/pages/stock_owner_spec.rb
index 557345dc8..fc5698fb9 100644
--- a/spec/models/form/lettings/pages/stock_owner_spec.rb
+++ b/spec/models/form/lettings/pages/stock_owner_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   describe "#routed_to?" do
@@ -33,7 +33,7 @@ RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
 
     context "when user nil" do
       it "is not shown" do
-        expect(page.routed_to?(log, nil)).to eq(false)
+        expect(page.routed_to?(log, nil)).to be(false)
       end
 
       it "does not update owning_organisation_id" do
@@ -45,7 +45,7 @@ RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
       let(:user) { create(:user, :support) }
 
       it "is shown" do
-        expect(page.routed_to?(log, user)).to eq(true)
+        expect(page.routed_to?(log, user)).to be(true)
       end
 
       it "does not update owning_organisation_id" do
@@ -61,7 +61,7 @@ RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
 
         context "with 0 stock_owners" do
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
 
           it "does not update owning_organisation_id" do
@@ -81,7 +81,7 @@ RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
           end
 
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
 
           it "updates owning_organisation_id" do
@@ -107,7 +107,7 @@ RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
           end
 
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
 
           it "updates owning_organisation_id" do
@@ -123,7 +123,7 @@ RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
 
         context "with 0 stock_owners" do
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
 
           it "updates owning_organisation_id to user organisation" do
@@ -140,7 +140,7 @@ RSpec.describe Form::Lettings::Pages::StockOwner, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
 
           it "does not update owning_organisation_id" do
diff --git a/spec/models/form/lettings/pages/tenancy_start_date_spec.rb b/spec/models/form/lettings/pages/tenancy_start_date_spec.rb
index e183d9683..a7f44f0bd 100644
--- a/spec/models/form/lettings/pages/tenancy_start_date_spec.rb
+++ b/spec/models/form/lettings/pages/tenancy_start_date_spec.rb
@@ -24,6 +24,6 @@ RSpec.describe Form::Lettings::Pages::TenancyStartDate, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/pages/tenant_code_spec.rb b/spec/models/form/lettings/pages/tenant_code_spec.rb
index 25b124fe1..f65f5e51b 100644
--- a/spec/models/form/lettings/pages/tenant_code_spec.rb
+++ b/spec/models/form/lettings/pages/tenant_code_spec.rb
@@ -24,6 +24,6 @@ RSpec.describe Form::Lettings::Pages::TenantCode, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/pages/uprn_selection_spec.rb b/spec/models/form/lettings/pages/uprn_selection_spec.rb
index 00dcd9508..c0be1da56 100644
--- a/spec/models/form/lettings/pages/uprn_selection_spec.rb
+++ b/spec/models/form/lettings/pages/uprn_selection_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Form::Lettings::Pages::UprnSelection, type: :model do
   end
 
   it "has the correct skip text" do
-    "Search for address again"
+    expect(page.skip_text).to eq("Search for address again")
   end
 
   it "has the correct skip_href" do
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 b8323662c..415cd1f61 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
@@ -21,7 +21,7 @@ RSpec.describe Form::Lettings::Questions::AddressLine1ForAddressMatcher, type: :
   end
 
   it "has the correct question_number" do
-    expect(question.question_number).to eq(nil)
+    expect(question.question_number).to be_nil
   end
 
   it "has the correct type" do
@@ -45,6 +45,6 @@ RSpec.describe Form::Lettings::Questions::AddressLine1ForAddressMatcher, type: :
   end
 
   it "has the correct disable_clearing_if_not_routed_or_dynamic_answer_options value" do
-    expect(question.disable_clearing_if_not_routed_or_dynamic_answer_options).to eq(true)
+    expect(question.disable_clearing_if_not_routed_or_dynamic_answer_options).to be(true)
   end
 end
diff --git a/spec/models/form/lettings/questions/address_line2_spec.rb b/spec/models/form/lettings/questions/address_line2_spec.rb
index 430a6d18b..db2cbe6d1 100644
--- a/spec/models/form/lettings/questions/address_line2_spec.rb
+++ b/spec/models/form/lettings/questions/address_line2_spec.rb
@@ -32,6 +32,6 @@ RSpec.describe Form::Lettings::Questions::AddressLine2, type: :model do
   end
 
   it "has the correct hidden_in_check_answers" do
-    expect(question.hidden_in_check_answers?).to eq(true)
+    expect(question.hidden_in_check_answers?).to be(true)
   end
 end
diff --git a/spec/models/form/lettings/questions/age_known_spec.rb b/spec/models/form/lettings/questions/age_known_spec.rb
index 5f7946a16..7a1835628 100644
--- a/spec/models/form/lettings/questions/age_known_spec.rb
+++ b/spec/models/form/lettings/questions/age_known_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Questions::AgeKnown, type: :model do
   subject(:question) { described_class.new(nil, question_definition, page, person_index:) }
 
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 4)))) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 4), person_question_count: 4))) }
   let(:person_index) { 2 }
 
   it "has correct page" do
diff --git a/spec/models/form/lettings/questions/age_spec.rb b/spec/models/form/lettings/questions/age_spec.rb
index 639f695fd..8d3003b82 100644
--- a/spec/models/form/lettings/questions/age_spec.rb
+++ b/spec/models/form/lettings/questions/age_spec.rb
@@ -1,10 +1,15 @@
 require "rails_helper"
 
 RSpec.describe Form::Lettings::Questions::Age, type: :model do
+  include CollectionTimeHelper
+
   subject(:question) { described_class.new(nil, question_definition, page, person_index:) }
 
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 4), start_year_2024_or_later?: false))) }
+  let(:start_year_2026_or_later?) { false }
+  let(:person_question_count) { 5 }
+  let(:start_year) { current_collection_start_year }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: collection_start_date_for_year(start_year), start_year_2024_or_later?: true, start_year_2026_or_later?: start_year_2026_or_later?, person_question_count:))) }
   let(:person_index) { 2 }
 
   it "has correct page" do
@@ -48,6 +53,25 @@ RSpec.describe Form::Lettings::Questions::Age, type: :model do
     it "has the correct check_answers_card_number" do
       expect(question.check_answers_card_number).to eq(2)
     end
+
+    context "with year 2025", metadata: { year: 25 } do
+      let(:start_year) { 2025 }
+      let(:person_question_count) { 4 }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(38)
+      end
+    end
+
+    context "with year 2026", metadata: { year: 26 } do
+      let(:start_year_2026_or_later?) { true }
+      let(:start_year) { 2026 }
+      let(:person_question_count) { 5 }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(37)
+      end
+    end
   end
 
   context "with person 3" do
@@ -69,5 +93,24 @@ RSpec.describe Form::Lettings::Questions::Age, type: :model do
     it "has the correct check_answers_card_number" do
       expect(question.check_answers_card_number).to eq(3)
     end
+
+    context "with year 2025", metadata: { year: 25 } do
+      let(:start_year) { 2025 }
+      let(:person_question_count) { 4 }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(42)
+      end
+    end
+
+    context "with year 2026", metadata: { year: 26 } do
+      let(:start_year_2026_or_later?) { true }
+      let(:start_year) { 2026 }
+      let(:person_question_count) { 5 }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(42)
+      end
+    end
   end
 end
diff --git a/spec/models/form/lettings/questions/location_id_spec.rb b/spec/models/form/lettings/questions/location_id_spec.rb
index 2b5572cb5..2ea72c705 100644
--- a/spec/models/form/lettings/questions/location_id_spec.rb
+++ b/spec/models/form/lettings/questions/location_id_spec.rb
@@ -175,8 +175,8 @@ RSpec.describe Form::Lettings::Questions::LocationId, type: :model do
     end
 
     it "is at the top" do
-      expect(question.top_guidance?).to eq(true)
-      expect(question.bottom_guidance?).to eq(false)
+      expect(question.top_guidance?).to be(true)
+      expect(question.bottom_guidance?).to be(false)
     end
   end
 end
diff --git a/spec/models/form/lettings/questions/net_income_known_spec.rb b/spec/models/form/lettings/questions/net_income_known_spec.rb
index fff32fba0..44b23865d 100644
--- a/spec/models/form/lettings/questions/net_income_known_spec.rb
+++ b/spec/models/form/lettings/questions/net_income_known_spec.rb
@@ -19,8 +19,8 @@ RSpec.describe Form::Lettings::Questions::NetIncomeKnown do
 
   describe "#partial guidance" do
     it "is at the top" do
-      expect(question.top_guidance?).to eq(true)
-      expect(question.bottom_guidance?).to eq(false)
+      expect(question.top_guidance?).to be(true)
+      expect(question.bottom_guidance?).to be(false)
     end
   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 472642288..fd2e69921 100644
--- a/spec/models/form/lettings/questions/no_address_found_spec.rb
+++ b/spec/models/form/lettings/questions/no_address_found_spec.rb
@@ -27,6 +27,6 @@ RSpec.describe Form::Lettings::Questions::NoAddressFound, type: :model do
   end
 
   it "has the correct hidden_in_check_answers" do
-    expect(question.hidden_in_check_answers).to eq(true)
+    expect(question.hidden_in_check_answers).to be(true)
   end
 end
diff --git a/spec/models/form/lettings/questions/person_partner_spec.rb b/spec/models/form/lettings/questions/person_partner_spec.rb
index 2106bc36f..a5593c9d8 100644
--- a/spec/models/form/lettings/questions/person_partner_spec.rb
+++ b/spec/models/form/lettings/questions/person_partner_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe Form::Lettings::Questions::PersonPartner, type: :model do
 
   let(:question_definition) { nil }
   let(:year) { nil }
+  let(:person_question_count) { 5 }
   let(:page) do
     instance_double(
       Form::Page,
@@ -17,6 +18,7 @@ RSpec.describe Form::Lettings::Questions::PersonPartner, type: :model do
           start_date: year ? collection_start_date_for_year(year) : current_collection_start_date,
           start_year_2025_or_later?: year.nil? || year >= 2025,
           start_year_2026_or_later?: year.nil? || year >= 2026,
+          person_question_count:,
         ),
       ),
     )
@@ -38,11 +40,11 @@ RSpec.describe Form::Lettings::Questions::PersonPartner, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to be nil
+    expect(question.conditional_for).to be_nil
   end
 
   it "has the correct hidden_in_check_answers" do
-    expect(question.hidden_in_check_answers).to be nil
+    expect(question.hidden_in_check_answers).to be_nil
   end
 
   context "with person 2" do
diff --git a/spec/models/form/lettings/questions/person_relationship_spec.rb b/spec/models/form/lettings/questions/person_relationship_spec.rb
index 0023c60ef..30073d347 100644
--- a/spec/models/form/lettings/questions/person_relationship_spec.rb
+++ b/spec/models/form/lettings/questions/person_relationship_spec.rb
@@ -28,11 +28,11 @@ RSpec.describe Form::Lettings::Questions::PersonRelationship, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to be nil
+    expect(question.conditional_for).to be_nil
   end
 
   it "has the correct hidden_in_check_answers" do
-    expect(question.hidden_in_check_answers).to be nil
+    expect(question.hidden_in_check_answers).to be_nil
   end
 
   context "with person 2" do
diff --git a/spec/models/form/lettings/questions/person_sex_registered_at_birth_spec.rb b/spec/models/form/lettings/questions/person_sex_registered_at_birth_spec.rb
index 90f48cfda..afa6e59a7 100644
--- a/spec/models/form/lettings/questions/person_sex_registered_at_birth_spec.rb
+++ b/spec/models/form/lettings/questions/person_sex_registered_at_birth_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Lettings::Questions::PersonSexRegisteredAtBirth, type: :mod
   let(:page) { instance_double(Form::Page) }
   let(:person_index) { 2 }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form, start_date: Time.zone.local(2026, 4, 1)) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2026, 4, 1), person_question_count: 5) }
 
   before do
     allow(page).to receive(:subsection).and_return(subsection)
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 503c699b2..7b313b840 100644
--- a/spec/models/form/lettings/questions/person_working_situation_spec.rb
+++ b/spec/models/form/lettings/questions/person_working_situation_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Lettings::Questions::PersonWorkingSituation, type: :model d
   subject(:question) { described_class.new(nil, question_definition, page, person_index:) }
 
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 4)))) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 4), start_year_2026_or_later?: false, person_question_count: 4))) }
   let(:person_index) { 2 }
 
   before do
@@ -46,11 +46,11 @@ RSpec.describe Form::Lettings::Questions::PersonWorkingSituation, type: :model d
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to be nil
+    expect(question.conditional_for).to be_nil
   end
 
   it "has the correct hidden_in_check_answers" do
-    expect(question.hidden_in_check_answers).to be nil
+    expect(question.hidden_in_check_answers).to be_nil
   end
 
   context "with person 2" 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 1a8e8d0d4..05d9ae2a7 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
@@ -17,7 +17,7 @@ RSpec.describe Form::Lettings::Questions::PostcodeForAddressMatcher, type: :mode
   end
 
   it "has the correct question_number" do
-    expect(question.question_number).to eq(nil)
+    expect(question.question_number).to be_nil
   end
 
   it "has the correct type" do
@@ -45,6 +45,6 @@ RSpec.describe Form::Lettings::Questions::PostcodeForAddressMatcher, type: :mode
   end
 
   it "has the correct disable_clearing_if_not_routed_or_dynamic_answer_options value" do
-    expect(question.disable_clearing_if_not_routed_or_dynamic_answer_options).to eq(true)
+    expect(question.disable_clearing_if_not_routed_or_dynamic_answer_options).to be(true)
   end
 end
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 ea8b5f67e..64f5f5804 100644
--- a/spec/models/form/lettings/questions/previous_let_type_spec.rb
+++ b/spec/models/form/lettings/questions/previous_let_type_spec.rb
@@ -8,8 +8,7 @@ RSpec.describe Form::Lettings::Questions::PreviousLetType, type: :model do
   let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
-    allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+    allow(form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false)
     allow(page).to receive(:subsection).and_return(subsection)
     allow(subsection).to receive(:form).and_return(form)
   end
diff --git a/spec/models/form/lettings/questions/reason_spec.rb b/spec/models/form/lettings/questions/reason_spec.rb
index 799348d42..b334d79d0 100644
--- a/spec/models/form/lettings/questions/reason_spec.rb
+++ b/spec/models/form/lettings/questions/reason_spec.rb
@@ -10,9 +10,7 @@ RSpec.describe Form::Lettings::Questions::Reason, type: :model do
   let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
-    allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2025_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2026_or_later?).and_return(false)
+    allow(form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false, start_year_2026_or_later?: false)
     allow(page).to receive(:subsection).and_return(subsection)
     allow(subsection).to receive(:form).and_return(form)
   end
diff --git a/spec/models/form/lettings/questions/scheme_id_spec.rb b/spec/models/form/lettings/questions/scheme_id_spec.rb
index ba5734b3b..b42b39a77 100644
--- a/spec/models/form/lettings/questions/scheme_id_spec.rb
+++ b/spec/models/form/lettings/questions/scheme_id_spec.rb
@@ -64,8 +64,7 @@ RSpec.describe Form::Lettings::Questions::SchemeId, type: :model do
       let(:real_2022_2023_form) { Form.new("config/forms/2022_2023.json") }
 
       before do
-        allow(lettings_log).to receive(:scheme_has_multiple_locations?).and_return(false)
-        allow(lettings_log).to receive(:form).and_return(real_2022_2023_form)
+        allow(lettings_log).to receive_messages(scheme_has_multiple_locations?: false, form: real_2022_2023_form)
       end
 
       it "returns the postcode" do
@@ -147,9 +146,9 @@ RSpec.describe Form::Lettings::Questions::SchemeId, type: :model do
         end
         answers.each do |answer|
           if answer.resource == "Select an option"
-            expect(question.answer_selected?(lettings_log, answer)).to eq(true)
+            expect(question.answer_selected?(lettings_log, answer)).to be(true)
           else
-            expect(question.answer_selected?(lettings_log, answer)).to eq(false)
+            expect(question.answer_selected?(lettings_log, answer)).to be(false)
           end
         end
       end
@@ -167,9 +166,9 @@ RSpec.describe Form::Lettings::Questions::SchemeId, type: :model do
         end
         answers.each do |answer|
           if answer.id.to_i == scheme.id
-            expect(question.answer_selected?(lettings_log, answer)).to eq(true)
+            expect(question.answer_selected?(lettings_log, answer)).to be(true)
           else
-            expect(question.answer_selected?(lettings_log, answer)).to eq(false)
+            expect(question.answer_selected?(lettings_log, answer)).to be(false)
           end
         end
       end
diff --git a/spec/models/form/lettings/questions/sheltered_spec.rb b/spec/models/form/lettings/questions/sheltered_spec.rb
index 4ff9268da..ae851b6d2 100644
--- a/spec/models/form/lettings/questions/sheltered_spec.rb
+++ b/spec/models/form/lettings/questions/sheltered_spec.rb
@@ -29,8 +29,7 @@ RSpec.describe Form::Lettings::Questions::Sheltered, type: :model do
     let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
 
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false)
     end
 
     it "has the correct answer_options" do
@@ -54,8 +53,7 @@ RSpec.describe Form::Lettings::Questions::Sheltered, type: :model do
     let(:form) { instance_double(Form, start_date: Time.zone.local(2025, 4, 1)) }
 
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true)
     end
 
     it "has the correct answer_options" do
diff --git a/spec/models/form/lettings/questions/uprn_confirmation_spec.rb b/spec/models/form/lettings/questions/uprn_confirmation_spec.rb
index 748f8979d..6032dfd0d 100644
--- a/spec/models/form/lettings/questions/uprn_confirmation_spec.rb
+++ b/spec/models/form/lettings/questions/uprn_confirmation_spec.rb
@@ -55,7 +55,7 @@ RSpec.describe Form::Lettings::Questions::UprnConfirmation, type: :model do
       let(:log) { build(:lettings_log, uprn_known: 0, uprn_confirmed: nil) }
 
       it "returns true" do
-        expect(question.hidden_in_check_answers?(log)).to eq(true)
+        expect(question.hidden_in_check_answers?(log)).to be(true)
       end
     end
 
@@ -63,7 +63,7 @@ RSpec.describe Form::Lettings::Questions::UprnConfirmation, type: :model do
       let(:log) { build(:lettings_log, :completed, uprn_known: 1, uprn: 1, uprn_confirmed: nil) }
 
       it "returns false" do
-        expect(question.hidden_in_check_answers?(log)).to eq(false)
+        expect(question.hidden_in_check_answers?(log)).to be(false)
       end
     end
 
@@ -73,7 +73,7 @@ RSpec.describe Form::Lettings::Questions::UprnConfirmation, type: :model do
       it "returns true" do
         log.uprn_known = 1
         log.uprn_confirmed = 1
-        expect(question.hidden_in_check_answers?(log)).to eq(true)
+        expect(question.hidden_in_check_answers?(log)).to be(true)
       end
     end
   end
diff --git a/spec/models/form/lettings/questions/uprn_selection_spec.rb b/spec/models/form/lettings/questions/uprn_selection_spec.rb
index e10b22d89..0a49ce0ac 100644
--- a/spec/models/form/lettings/questions/uprn_selection_spec.rb
+++ b/spec/models/form/lettings/questions/uprn_selection_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Form::Lettings::Questions::UprnSelection, type: :model do
   end
 
   it "has the correct question_number" do
-    expect(question.question_number).to eq(nil)
+    expect(question.question_number).to be_nil
   end
 
   it "has the correct type" do
@@ -71,7 +71,7 @@ RSpec.describe Form::Lettings::Questions::UprnSelection, type: :model do
       stub_request(:get, /api\.os\.uk/)
         .to_return(status: 200, body: '{"results": {"0": "address_0", "1": "address_1", "2": "address_2"}}', headers: {})
 
-      expect(question.hidden_in_check_answers?(log)).to eq(false)
+      expect(question.hidden_in_check_answers?(log)).to be(false)
     end
   end
 
@@ -84,7 +84,7 @@ RSpec.describe Form::Lettings::Questions::UprnSelection, type: :model do
       stub_request(:get, /api\.os\.uk/)
         .to_return(status: 200, body: "", headers: {})
 
-      expect(question.hidden_in_check_answers?(log)).to eq(true)
+      expect(question.hidden_in_check_answers?(log)).to be(true)
     end
   end
 
diff --git a/spec/models/form/lettings/questions/waityear_spec.rb b/spec/models/form/lettings/questions/waityear_spec.rb
index 1ed9fbaab..cf5cd746f 100644
--- a/spec/models/form/lettings/questions/waityear_spec.rb
+++ b/spec/models/form/lettings/questions/waityear_spec.rb
@@ -9,8 +9,7 @@ RSpec.describe Form::Lettings::Questions::Waityear, type: :model do
   let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
-    allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+    allow(form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false)
     allow(page).to receive(:subsection).and_return(subsection)
     allow(subsection).to receive(:form).and_return(form)
   end
diff --git a/spec/models/form/lettings/sections/household_spec.rb b/spec/models/form/lettings/sections/household_spec.rb
index eedf92854..55738dcc7 100644
--- a/spec/models/form/lettings/sections/household_spec.rb
+++ b/spec/models/form/lettings/sections/household_spec.rb
@@ -24,6 +24,6 @@ RSpec.describe Form::Lettings::Sections::Household, type: :model do
   end
 
   it "has the correct description" do
-    expect(household.description).to be nil
+    expect(household.description).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/sections/rent_and_charges_spec.rb b/spec/models/form/lettings/sections/rent_and_charges_spec.rb
index 1a523ca90..40ad30070 100644
--- a/spec/models/form/lettings/sections/rent_and_charges_spec.rb
+++ b/spec/models/form/lettings/sections/rent_and_charges_spec.rb
@@ -24,6 +24,6 @@ RSpec.describe Form::Lettings::Sections::RentAndCharges, type: :model do
   end
 
   it "has the correct description" do
-    expect(rent_and_charges.description).to be nil
+    expect(rent_and_charges.description).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/sections/tenancy_and_property_spec.rb b/spec/models/form/lettings/sections/tenancy_and_property_spec.rb
index bc7166be1..eb8e47c5f 100644
--- a/spec/models/form/lettings/sections/tenancy_and_property_spec.rb
+++ b/spec/models/form/lettings/sections/tenancy_and_property_spec.rb
@@ -24,6 +24,6 @@ RSpec.describe Form::Lettings::Sections::TenancyAndProperty, type: :model do
   end
 
   it "has the correct description" do
-    expect(tenancy_and_property.description).to be nil
+    expect(tenancy_and_property.description).to be_nil
   end
 end
diff --git a/spec/models/form/lettings/subsections/household_characteristics_spec.rb b/spec/models/form/lettings/subsections/household_characteristics_spec.rb
index e403749ec..c1388aba2 100644
--- a/spec/models/form/lettings/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/lettings/subsections/household_characteristics_spec.rb
@@ -10,9 +10,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
 
   before do
     allow(section).to receive(:form).and_return(form)
-    allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2025_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2026_or_later?).and_return(false)
+    allow(form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false, start_year_2026_or_later?: false)
   end
 
   it "has correct section" do
@@ -175,8 +173,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
 
   context "with start year 2025", metadata: { year: 25 } do
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true)
     end
 
     it "has correct pages" do
@@ -330,9 +327,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
 
   context "with start year 2026", metadata: { year: 26 } do
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2026_or_later?).and_return(true)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true, start_year_2026_or_later?: true)
     end
 
     it "has correct pages" do
diff --git a/spec/models/form/lettings/subsections/household_needs_spec.rb b/spec/models/form/lettings/subsections/household_needs_spec.rb
index 01423f8dd..36b3a52dd 100644
--- a/spec/models/form/lettings/subsections/household_needs_spec.rb
+++ b/spec/models/form/lettings/subsections/household_needs_spec.rb
@@ -9,8 +9,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdNeeds, type: :model do
   let(:section) { instance_double(Form::Lettings::Sections::Household, form:) }
 
   before do
-    allow(form).to receive(:start_year_2025_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2026_or_later?).and_return(false)
+    allow(form).to receive_messages(start_year_2025_or_later?: false, start_year_2026_or_later?: false)
   end
 
   it "has correct section" do
@@ -42,8 +41,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdNeeds, type: :model do
 
   context "with start year >= 2026", metadata: { year: 26 } do
     before do
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2026_or_later?).and_return(true)
+      allow(form).to receive_messages(start_year_2025_or_later?: true, start_year_2026_or_later?: true)
     end
 
     it "has correct pages" do
diff --git a/spec/models/form/lettings/subsections/household_situation_spec.rb b/spec/models/form/lettings/subsections/household_situation_spec.rb
index 3da63a140..a42ba9f75 100644
--- a/spec/models/form/lettings/subsections/household_situation_spec.rb
+++ b/spec/models/form/lettings/subsections/household_situation_spec.rb
@@ -10,9 +10,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdSituation, type: :model do
 
   before do
     allow(section).to receive(:form).and_return(form)
-    allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2025_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2026_or_later?).and_return(false)
+    allow(form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false, start_year_2026_or_later?: false)
   end
 
   it "has correct section" do
@@ -52,8 +50,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdSituation, type: :model do
 
   context "with form year is 2025", metadata: { year: 25 } do
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true)
     end
 
     it "has correct pages" do
@@ -86,9 +83,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdSituation, type: :model do
 
   context "with form year is 2026", metadata: { year: 26 } do
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2026_or_later?).and_return(true)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true, start_year_2026_or_later?: true)
     end
 
     it "has correct pages" do
diff --git a/spec/models/form/lettings/subsections/property_information_spec.rb b/spec/models/form/lettings/subsections/property_information_spec.rb
index 245106036..03fcc2cbf 100644
--- a/spec/models/form/lettings/subsections/property_information_spec.rb
+++ b/spec/models/form/lettings/subsections/property_information_spec.rb
@@ -14,18 +14,14 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do
     let(:form) { instance_double(Form, start_date:) }
 
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2026_or_later?).and_return(true)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true, start_year_2026_or_later?: true)
     end
 
     context "when 2024" do
       let(:start_date) { Time.utc(2024, 4, 8) }
 
       before do
-        allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-        allow(form).to receive(:start_year_2025_or_later?).and_return(false)
-        allow(form).to receive(:start_year_2026_or_later?).and_return(false)
+        allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false, start_year_2026_or_later?: false)
       end
 
       it "has correct pages" do
@@ -56,7 +52,7 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do
         let(:log) { FactoryBot.build(:lettings_log, needstype: 2, renewal: 1) }
 
         it "is not displayed in tasklist" do
-          expect(property_information.displayed_in_tasklist?(log)).to eq(false)
+          expect(property_information.displayed_in_tasklist?(log)).to be(false)
         end
       end
     end
@@ -65,9 +61,7 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do
       let(:start_date) { Time.utc(2025, 4, 8) }
 
       before do
-        allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-        allow(form).to receive(:start_year_2025_or_later?).and_return(true)
-        allow(form).to receive(:start_year_2026_or_later?).and_return(false)
+        allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true, start_year_2026_or_later?: false)
       end
 
       it "has correct pages" do
@@ -99,7 +93,7 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do
         let(:log) { FactoryBot.build(:lettings_log, needstype: 2, renewal: 1) }
 
         it "is displayed in tasklist" do
-          expect(property_information.displayed_in_tasklist?(log)).to eq(true)
+          expect(property_information.displayed_in_tasklist?(log)).to be(true)
         end
       end
     end
@@ -108,9 +102,7 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do
       let(:start_date) { Time.utc(2026, 4, 8) }
 
       before do
-        allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-        allow(form).to receive(:start_year_2025_or_later?).and_return(true)
-        allow(form).to receive(:start_year_2026_or_later?).and_return(true)
+        allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true, start_year_2026_or_later?: true)
       end
 
       it "has correct pages" do
diff --git a/spec/models/form/lettings/subsections/tenancy_information_spec.rb b/spec/models/form/lettings/subsections/tenancy_information_spec.rb
index 70663629c..74d1dad19 100644
--- a/spec/models/form/lettings/subsections/tenancy_information_spec.rb
+++ b/spec/models/form/lettings/subsections/tenancy_information_spec.rb
@@ -16,16 +16,14 @@ RSpec.describe Form::Lettings::Subsections::TenancyInformation, type: :model do
     let(:form) { instance_double(Form, start_date:) }
 
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false, start_year_2026_or_later?: false)
     end
 
     context "when 2023" do
       let(:start_date) { Time.utc(2023, 2, 8) }
 
       before do
-        allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-        allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+        allow(form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false, start_year_2026_or_later?: false)
       end
 
       it "has correct pages" do
@@ -39,8 +37,7 @@ RSpec.describe Form::Lettings::Subsections::TenancyInformation, type: :model do
       let(:start_date) { Time.utc(2024, 2, 8) }
 
       before do
-        allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-        allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+        allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false, start_year_2026_or_later?: false)
       end
 
       it "has correct pages" do
@@ -54,8 +51,7 @@ RSpec.describe Form::Lettings::Subsections::TenancyInformation, type: :model do
       let(:start_date) { Time.utc(2025, 2, 8) }
 
       before do
-        allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-        allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+        allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true, start_year_2026_or_later?: false)
       end
 
       it "has correct pages" do
@@ -64,6 +60,20 @@ RSpec.describe Form::Lettings::Subsections::TenancyInformation, type: :model do
         )
       end
     end
+
+    context "when 2026" do
+      let(:start_date) { Time.utc(2026, 2, 8) }
+
+      before do
+        allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true, start_year_2026_or_later?: true)
+      end
+
+      it "has correct pages" do
+        expect(tenancy_information.pages.map(&:id)).to eq(
+          %w[joint starter_tenancy tenancy_type starter_tenancy_type tenancyother_value_check tenancy_length tenancy_length_affordable_rent tenancy_length_intermediate_rent tenancy_length_periodic],
+        )
+      end
+    end
   end
 
   it "has the correct id" do
diff --git a/spec/models/form/page_spec.rb b/spec/models/form/page_spec.rb
index 3ec929fc4..ff7bd3f7a 100644
--- a/spec/models/form/page_spec.rb
+++ b/spec/models/form/page_spec.rb
@@ -37,8 +37,7 @@ RSpec.describe Form::Page, type: :model do
 
     context "and translation is present" do
       before do
-        allow(I18n).to receive(:t).and_return("page header copy")
-        allow(I18n).to receive(:exists?).and_return(true)
+        allow(I18n).to receive_messages(t: "page header copy", exists?: true)
       end
 
       it "uses header from translations" do
diff --git a/spec/models/form/sales/pages/about_price_value_check_spec.rb b/spec/models/form/sales/pages/about_price_value_check_spec.rb
index 1193768db..6ddc16066 100644
--- a/spec/models/form/sales/pages/about_price_value_check_spec.rb
+++ b/spec/models/form/sales/pages/about_price_value_check_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Form::Sales::Pages::AboutPriceValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has the correct title_text" do
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
index c1cbb1dff..4b30cc01c 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicGroup, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicGroup, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -60,7 +60,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicGroup, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
     end
@@ -78,7 +78,7 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicGroup, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
diff --git a/spec/models/form/sales/pages/buyer1_income_discounted_max_value_check_spec.rb b/spec/models/form/sales/pages/buyer1_income_discounted_max_value_check_spec.rb
index 2282a9535..ff0e5cfc2 100644
--- a/spec/models/form/sales/pages/buyer1_income_discounted_max_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_income_discounted_max_value_check_spec.rb
@@ -29,6 +29,6 @@ RSpec.describe Form::Sales::Pages::Buyer1IncomeDiscountedMaxValueCheck, type: :m
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 end
diff --git a/spec/models/form/sales/pages/buyer1_income_ecstat_value_check_spec.rb b/spec/models/form/sales/pages/buyer1_income_ecstat_value_check_spec.rb
index 9d710aebb..38f501626 100644
--- a/spec/models/form/sales/pages/buyer1_income_ecstat_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_income_ecstat_value_check_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Form::Sales::Pages::Buyer1IncomeEcstatValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "is has correct interruption_screen_question_ids" do
diff --git a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
index 76cb612eb..31623a0aa 100644
--- a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 2, noint: nil, staircase: 2, ownershipsch: 1, buylivein: nil) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 2, noint: 1, staircase: 2, ownershipsch: 1, buylivein: nil) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -52,7 +52,7 @@ RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2, ownershipsch: 1, buylivein: 1) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -60,7 +60,7 @@ RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1, staircase: 2, ownershipsch: 1, buylivein: 1) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -94,7 +94,7 @@ RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 2, noint: 1, staircase: 2, ownershipsch: 1, buylivein: nil) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
diff --git a/spec/models/form/sales/pages/buyer1_nationality_spec.rb b/spec/models/form/sales/pages/buyer1_nationality_spec.rb
index ad09ee526..85b875cb7 100644
--- a/spec/models/form/sales/pages/buyer1_nationality_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_nationality_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe Form::Sales::Pages::Buyer1Nationality, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -50,7 +50,7 @@ RSpec.describe Form::Sales::Pages::Buyer1Nationality, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -66,7 +66,7 @@ RSpec.describe Form::Sales::Pages::Buyer1Nationality, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
     end
@@ -84,7 +84,7 @@ RSpec.describe Form::Sales::Pages::Buyer1Nationality, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
diff --git a/spec/models/form/sales/pages/buyer1_working_situation_spec.rb b/spec/models/form/sales/pages/buyer1_working_situation_spec.rb
index 47a997623..7f4ee8db6 100644
--- a/spec/models/form/sales/pages/buyer1_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_working_situation_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Pages::Buyer1WorkingSituation, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -40,7 +40,7 @@ RSpec.describe Form::Sales::Pages::Buyer1WorkingSituation, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -56,7 +56,7 @@ RSpec.describe Form::Sales::Pages::Buyer1WorkingSituation, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
     end
@@ -74,7 +74,7 @@ RSpec.describe Form::Sales::Pages::Buyer1WorkingSituation, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
diff --git a/spec/models/form/sales/pages/buyer2_ethnic_group_spec.rb b/spec/models/form/sales/pages/buyer2_ethnic_group_spec.rb
index d12138682..d7a7b1f73 100644
--- a/spec/models/form/sales/pages/buyer2_ethnic_group_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_ethnic_group_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Pages::Buyer2EthnicGroup, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Pages::Buyer2EthnicGroup, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -60,7 +60,7 @@ RSpec.describe Form::Sales::Pages::Buyer2EthnicGroup, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -86,7 +86,7 @@ RSpec.describe Form::Sales::Pages::Buyer2EthnicGroup, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
diff --git a/spec/models/form/sales/pages/buyer2_income_discounted_max_value_check_spec.rb b/spec/models/form/sales/pages/buyer2_income_discounted_max_value_check_spec.rb
index 36a04cedb..738ce9b35 100644
--- a/spec/models/form/sales/pages/buyer2_income_discounted_max_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_income_discounted_max_value_check_spec.rb
@@ -29,6 +29,6 @@ RSpec.describe Form::Sales::Pages::Buyer2IncomeDiscountedMaxValueCheck, type: :m
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 end
diff --git a/spec/models/form/sales/pages/buyer2_income_ecstat_value_check_spec.rb b/spec/models/form/sales/pages/buyer2_income_ecstat_value_check_spec.rb
index 2ced58f17..b6d28659b 100644
--- a/spec/models/form/sales/pages/buyer2_income_ecstat_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_income_ecstat_value_check_spec.rb
@@ -29,6 +29,6 @@ RSpec.describe Form::Sales::Pages::Buyer2IncomeEcstatValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 end
diff --git a/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb
index 73a56be00..b2aaa8d48 100644
--- a/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: nil, staircase: 2, ownershipsch: 1, buylivein: nil) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1, staircase: 2, ownershipsch: 1, buylivein: nil) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -52,7 +52,7 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2, ownershipsch: 1, buylivein: 1) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -60,7 +60,7 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1, staircase: 2, ownershipsch: 1, buylivein: 1) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -94,7 +94,7 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 1, staircase: 2, ownershipsch: 1, buylivein: nil) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
diff --git a/spec/models/form/sales/pages/buyer2_nationality_spec.rb b/spec/models/form/sales/pages/buyer2_nationality_spec.rb
index fa9270ec7..72ba93bdd 100644
--- a/spec/models/form/sales/pages/buyer2_nationality_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_nationality_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe Form::Sales::Pages::Buyer2Nationality, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -46,7 +46,7 @@ RSpec.describe Form::Sales::Pages::Buyer2Nationality, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -62,7 +62,7 @@ RSpec.describe Form::Sales::Pages::Buyer2Nationality, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -88,7 +88,7 @@ RSpec.describe Form::Sales::Pages::Buyer2Nationality, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
diff --git a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
index f0022006e..ecf850339 100644
--- a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -60,7 +60,7 @@ RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, type: :model do
         let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
@@ -86,7 +86,7 @@ RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, type: :model do
         let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
         it "routes to the page" do
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
 
diff --git a/spec/models/form/sales/pages/buyer_live_in_value_check_spec.rb b/spec/models/form/sales/pages/buyer_live_in_value_check_spec.rb
index 72234b6d5..5bb11083f 100644
--- a/spec/models/form/sales/pages/buyer_live_in_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer_live_in_value_check_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe Form::Sales::Pages::BuyerLiveInValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has the correct title_text" do
diff --git a/spec/models/form/sales/pages/buyer_live_spec.rb b/spec/models/form/sales/pages/buyer_live_spec.rb
index 1880c37e3..f5d4b2d52 100644
--- a/spec/models/form/sales/pages/buyer_live_spec.rb
+++ b/spec/models/form/sales/pages/buyer_live_spec.rb
@@ -13,8 +13,7 @@ RSpec.describe Form::Sales::Pages::BuyerLive, type: :model do
     let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
 
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false)
       allow(subsection).to receive(:form).and_return(form)
     end
 
@@ -45,8 +44,7 @@ RSpec.describe Form::Sales::Pages::BuyerLive, type: :model do
     let(:form) { instance_double(Form, start_date: Time.zone.local(2025, 4, 1)) }
 
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true)
       allow(subsection).to receive(:form).and_return(form)
     end
 
diff --git a/spec/models/form/sales/pages/buyer_previous_spec.rb b/spec/models/form/sales/pages/buyer_previous_spec.rb
index 8e1486ee6..d467df01f 100644
--- a/spec/models/form/sales/pages/buyer_previous_spec.rb
+++ b/spec/models/form/sales/pages/buyer_previous_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe Form::Sales::Pages::BuyerPrevious, type: :model do
 
     it "has correct routed to" do
       log.staircase = 1
-      expect(page.routed_to?(log, nil)).to eq(true)
+      expect(page.routed_to?(log, nil)).to be(true)
     end
   end
 
@@ -56,22 +56,22 @@ RSpec.describe Form::Sales::Pages::BuyerPrevious, type: :model do
 
     it "has correct routed to when staircase is yes" do
       log.staircase = 1
-      expect(page.routed_to?(log, nil)).to eq(false)
+      expect(page.routed_to?(log, nil)).to be(false)
     end
 
     it "has correct routed to when staircase is nil" do
       log.staircase = nil
-      expect(page.routed_to?(log, nil)).to eq(true)
+      expect(page.routed_to?(log, nil)).to be(true)
     end
 
     it "has correct routed to when staircase is no" do
       log.staircase = 2
-      expect(page.routed_to?(log, nil)).to eq(true)
+      expect(page.routed_to?(log, nil)).to be(true)
     end
 
     it "has correct routed to when staircase is don't know" do
       log.staircase = 3
-      expect(page.routed_to?(log, nil)).to eq(true)
+      expect(page.routed_to?(log, nil)).to be(true)
     end
   end
 end
diff --git a/spec/models/form/sales/pages/buyers_organisations_spec.rb b/spec/models/form/sales/pages/buyers_organisations_spec.rb
index 86527a0f8..c15894a05 100644
--- a/spec/models/form/sales/pages/buyers_organisations_spec.rb
+++ b/spec/models/form/sales/pages/buyers_organisations_spec.rb
@@ -24,6 +24,6 @@ RSpec.describe Form::Sales::Pages::BuyersOrganisations, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 end
diff --git a/spec/models/form/sales/pages/combined_income_max_value_check_spec.rb b/spec/models/form/sales/pages/combined_income_max_value_check_spec.rb
index 85dd29c5c..953757df5 100644
--- a/spec/models/form/sales/pages/combined_income_max_value_check_spec.rb
+++ b/spec/models/form/sales/pages/combined_income_max_value_check_spec.rb
@@ -29,6 +29,6 @@ RSpec.describe Form::Sales::Pages::CombinedIncomeMaxValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 end
diff --git a/spec/models/form/sales/pages/created_by_spec.rb b/spec/models/form/sales/pages/created_by_spec.rb
index 7d9a25018..a025c0fb7 100644
--- a/spec/models/form/sales/pages/created_by_spec.rb
+++ b/spec/models/form/sales/pages/created_by_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Form::Sales::Pages::CreatedBy, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   context "when the current user is a support user" do
diff --git a/spec/models/form/sales/pages/deposit_spec.rb b/spec/models/form/sales/pages/deposit_spec.rb
index ea309bffc..acb6556a8 100644
--- a/spec/models/form/sales/pages/deposit_spec.rb
+++ b/spec/models/form/sales/pages/deposit_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Form::Sales::Pages::Deposit, type: :model do
   end
 
   it "has the correct id" do
-    expect(page.id).to eq(nil)
+    expect(page.id).to be_nil
   end
 
   it "has the correct description" do
diff --git a/spec/models/form/sales/pages/deposit_value_check_spec.rb b/spec/models/form/sales/pages/deposit_value_check_spec.rb
index 1fa3047f0..8ef1fdeeb 100644
--- a/spec/models/form/sales/pages/deposit_value_check_spec.rb
+++ b/spec/models/form/sales/pages/deposit_value_check_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe Form::Sales::Pages::DepositValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "is has correct interruption_screen_question_ids" do
diff --git a/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb b/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
index 3b51ec744..b140372db 100644
--- a/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
+++ b/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Pages::DiscountedSaleValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/extra_borrowing_spec.rb b/spec/models/form/sales/pages/extra_borrowing_spec.rb
index eb719c295..3bbdfb5a5 100644
--- a/spec/models/form/sales/pages/extra_borrowing_spec.rb
+++ b/spec/models/form/sales/pages/extra_borrowing_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Pages::ExtraBorrowing, type: :model do
   end
 
   it "has the correct id" do
-    expect(page.id).to eq(nil)
+    expect(page.id).to be_nil
   end
 
   it "has the correct description" do
diff --git a/spec/models/form/sales/pages/handover_date_check_spec.rb b/spec/models/form/sales/pages/handover_date_check_spec.rb
index e6cc3acf5..bd8e1177d 100644
--- a/spec/models/form/sales/pages/handover_date_check_spec.rb
+++ b/spec/models/form/sales/pages/handover_date_check_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe Form::Sales::Pages::HandoverDateCheck, type: :model do
     end
 
     it "is interruption screen page" do
-      expect(page.interruption_screen?).to eq(true)
+      expect(page.interruption_screen?).to be(true)
     end
 
     it "is has correct interruption_screen_question_ids" do
diff --git a/spec/models/form/sales/pages/household_wheelchair_check_spec.rb b/spec/models/form/sales/pages/household_wheelchair_check_spec.rb
index 68e269cbf..7627715c5 100644
--- a/spec/models/form/sales/pages/household_wheelchair_check_spec.rb
+++ b/spec/models/form/sales/pages/household_wheelchair_check_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Form::Sales::Pages::HouseholdWheelchairCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "is has correct interruption_screen_question_ids" do
diff --git a/spec/models/form/sales/pages/joint_purchase_spec.rb b/spec/models/form/sales/pages/joint_purchase_spec.rb
index bba9384ad..55c997139 100644
--- a/spec/models/form/sales/pages/joint_purchase_spec.rb
+++ b/spec/models/form/sales/pages/joint_purchase_spec.rb
@@ -10,8 +10,7 @@ RSpec.describe Form::Sales::Pages::JointPurchase, type: :model do
     let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1))) }
 
     before do
-      allow(subsection.form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(subsection.form).to receive(:start_year_2025_or_later?).and_return(false)
+      allow(subsection.form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false)
     end
 
     it "has correct subsection" do
@@ -43,8 +42,7 @@ RSpec.describe Form::Sales::Pages::JointPurchase, type: :model do
     let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) }
 
     before do
-      allow(subsection.form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+      allow(subsection.form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true)
     end
 
     it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/la_nominations_spec.rb b/spec/models/form/sales/pages/la_nominations_spec.rb
index 190afaa86..1e5c246cd 100644
--- a/spec/models/form/sales/pages/la_nominations_spec.rb
+++ b/spec/models/form/sales/pages/la_nominations_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Pages::LaNominations, type: :model do
 
     it "has correct routed to" do
       log.staircase = 1
-      expect(page.routed_to?(log, nil)).to eq(true)
+      expect(page.routed_to?(log, nil)).to be(true)
     end
   end
 
@@ -45,22 +45,22 @@ RSpec.describe Form::Sales::Pages::LaNominations, type: :model do
 
     it "has correct routed to when staircase is yes" do
       log.staircase = 1
-      expect(page.routed_to?(log, nil)).to eq(false)
+      expect(page.routed_to?(log, nil)).to be(false)
     end
 
     it "has correct routed to when staircase is nil" do
       log.staircase = nil
-      expect(page.routed_to?(log, nil)).to eq(true)
+      expect(page.routed_to?(log, nil)).to be(true)
     end
 
     it "has correct routed to when staircase is no" do
       log.staircase = 2
-      expect(page.routed_to?(log, nil)).to eq(true)
+      expect(page.routed_to?(log, nil)).to be(true)
     end
 
     it "has correct routed to when staircase is don't know" do
       log.staircase = 3
-      expect(page.routed_to?(log, nil)).to eq(true)
+      expect(page.routed_to?(log, nil)).to be(true)
     end
   end
 end
diff --git a/spec/models/form/sales/pages/leasehold_charges_spec.rb b/spec/models/form/sales/pages/leasehold_charges_spec.rb
index b03920d3f..2f2cfba17 100644
--- a/spec/models/form/sales/pages/leasehold_charges_spec.rb
+++ b/spec/models/form/sales/pages/leasehold_charges_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Pages::LeaseholdCharges, type: :model do
   end
 
   it "has the correct id" do
-    expect(page.id).to eq(nil)
+    expect(page.id).to be_nil
   end
 
   it "has the correct description" do
diff --git a/spec/models/form/sales/pages/living_before_purchase_spec.rb b/spec/models/form/sales/pages/living_before_purchase_spec.rb
index 1f7cf6c51..3a536e188 100644
--- a/spec/models/form/sales/pages/living_before_purchase_spec.rb
+++ b/spec/models/form/sales/pages/living_before_purchase_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe Form::Sales::Pages::LivingBeforePurchase, type: :model do
   end
 
   it "has the correct id" do
-    expect(page.id).to eq(nil)
+    expect(page.id).to be_nil
   end
 
   it "has the correct description" do
@@ -50,17 +50,17 @@ RSpec.describe Form::Sales::Pages::LivingBeforePurchase, type: :model do
 
         it "routes to the page when joint purchase is true" do
           log = build(:sales_log, jointpur: 1)
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
 
         it "does not route to the page when joint purchase is false" do
           log = build(:sales_log, jointpur: 2)
-          expect(page.routed_to?(log, nil)).to eq(false)
+          expect(page.routed_to?(log, nil)).to be(false)
         end
 
         it "does not route to the page when joint purchase is missing" do
           log = build(:sales_log, jointpur: nil)
-          expect(page.routed_to?(log, nil)).to eq(false)
+          expect(page.routed_to?(log, nil)).to be(false)
         end
       end
 
@@ -69,17 +69,17 @@ RSpec.describe Form::Sales::Pages::LivingBeforePurchase, type: :model do
 
         it "routes to the page when joint purchase is false" do
           log = build(:sales_log, jointpur: 2)
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
 
         it "does not route to the page when joint purchase is true" do
           log = build(:sales_log, jointpur: 1)
-          expect(page.routed_to?(log, nil)).to eq(false)
+          expect(page.routed_to?(log, nil)).to be(false)
         end
 
         it "routes to the page when joint purchase is missing" do
           log = build(:sales_log, jointpur: nil)
-          expect(page.routed_to?(log, nil)).to eq(true)
+          expect(page.routed_to?(log, nil)).to be(true)
         end
       end
     end
@@ -91,12 +91,12 @@ RSpec.describe Form::Sales::Pages::LivingBeforePurchase, type: :model do
 
       it "routes to the page when resale is 2" do
         log = build(:sales_log, jointpur: 1, resale: 2)
-        expect(page.routed_to?(log, nil)).to eq(true)
+        expect(page.routed_to?(log, nil)).to be(true)
       end
 
       it "does not route to the page when resale is not 2" do
         log = build(:sales_log, jointpur: 1, resale: nil, ownershipsch: 1)
-        expect(page.routed_to?(log, nil)).to eq(false)
+        expect(page.routed_to?(log, nil)).to be(false)
       end
     end
   end
diff --git a/spec/models/form/sales/pages/managing_organisation_spec.rb b/spec/models/form/sales/pages/managing_organisation_spec.rb
index 30383a1f5..507c3d735 100644
--- a/spec/models/form/sales/pages/managing_organisation_spec.rb
+++ b/spec/models/form/sales/pages/managing_organisation_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   describe "#routed_to? with 2023 logs" do
@@ -34,7 +34,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
 
     context "when user nil" do
       it "is not shown" do
-        expect(page.routed_to?(log, nil)).to eq(false)
+        expect(page.routed_to?(log, nil)).to be(false)
       end
     end
 
@@ -42,7 +42,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
       let(:user) { create(:user) }
 
       it "is not shown" do
-        expect(page.routed_to?(log, nil)).to eq(false)
+        expect(page.routed_to?(log, nil)).to be(false)
       end
     end
 
@@ -53,13 +53,13 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
         let(:log) { create(:sales_log, owning_organisation: nil) }
 
         it "is not shown" do
-          expect(page.routed_to?(log, user)).to eq(false)
+          expect(page.routed_to?(log, user)).to be(false)
         end
       end
 
       context "with 0 managing_agents" do
         it "is not shown" do
-          expect(page.routed_to?(log, user)).to eq(false)
+          expect(page.routed_to?(log, user)).to be(false)
         end
       end
 
@@ -70,7 +70,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
         end
 
         it "is shown" do
-          expect(page.routed_to?(log, user)).to eq(true)
+          expect(page.routed_to?(log, user)).to be(true)
         end
       end
 
@@ -86,7 +86,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
         end
 
         it "is shown" do
-          expect(page.routed_to?(log, user)).to eq(true)
+          expect(page.routed_to?(log, user)).to be(true)
         end
       end
     end
@@ -95,7 +95,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
       let(:user) { create(:user, :data_coordinator, organisation: create(:organisation, holds_own_stock: false)) }
 
       it "is not shown" do
-        expect(page.routed_to?(log, user)).to eq(false)
+        expect(page.routed_to?(log, user)).to be(false)
       end
     end
   end
@@ -107,7 +107,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
 
     context "when user nil" do
       it "is not shown" do
-        expect(page.routed_to?(log, nil)).to eq(false)
+        expect(page.routed_to?(log, nil)).to be(false)
       end
     end
 
@@ -119,7 +119,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
         let(:log) { create(:sales_log, owning_organisation: user.organisation) }
 
         it "is shown" do
-          expect(page.routed_to?(log, user)).to eq(true)
+          expect(page.routed_to?(log, user)).to be(true)
         end
       end
 
@@ -128,7 +128,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
         let(:log) { create(:sales_log, owning_organisation: nil) }
 
         it "is not shown" do
-          expect(page.routed_to?(log, user)).to eq(false)
+          expect(page.routed_to?(log, user)).to be(false)
         end
       end
 
@@ -139,7 +139,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
 
         context "with 0 managing_agents" do
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
         end
 
@@ -150,7 +150,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
 
@@ -166,7 +166,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
       end
@@ -180,7 +180,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
           let(:log) { create(:sales_log, owning_organisation: user.organisation) }
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
 
@@ -193,7 +193,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
         end
       end
@@ -205,7 +205,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
 
         context "with 0 managing_agents" do
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
         end
 
@@ -216,7 +216,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
 
@@ -232,7 +232,7 @@ RSpec.describe Form::Sales::Pages::ManagingOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
       end
diff --git a/spec/models/form/sales/pages/monthly_charges_value_check_spec.rb b/spec/models/form/sales/pages/monthly_charges_value_check_spec.rb
index ce72bbda8..9ba7f0657 100644
--- a/spec/models/form/sales/pages/monthly_charges_value_check_spec.rb
+++ b/spec/models/form/sales/pages/monthly_charges_value_check_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Form::Sales::Pages::MonthlyChargesValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has correct title_text" do
diff --git a/spec/models/form/sales/pages/mortgage_amount_spec.rb b/spec/models/form/sales/pages/mortgage_amount_spec.rb
index a6298f1e8..4d7a0944a 100644
--- a/spec/models/form/sales/pages/mortgage_amount_spec.rb
+++ b/spec/models/form/sales/pages/mortgage_amount_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Pages::MortgageAmount, type: :model do
   end
 
   it "has the correct id" do
-    expect(page.id).to eq(nil)
+    expect(page.id).to be_nil
   end
 
   it "has the correct description" do
diff --git a/spec/models/form/sales/pages/mortgage_length_spec.rb b/spec/models/form/sales/pages/mortgage_length_spec.rb
index 7e1ab9f26..4fdf9b880 100644
--- a/spec/models/form/sales/pages/mortgage_length_spec.rb
+++ b/spec/models/form/sales/pages/mortgage_length_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Pages::MortgageLength, type: :model do
   end
 
   it "has the correct id" do
-    expect(page.id).to eq(nil)
+    expect(page.id).to be_nil
   end
 
   it "has the correct description" do
diff --git a/spec/models/form/sales/pages/mortgage_value_check_spec.rb b/spec/models/form/sales/pages/mortgage_value_check_spec.rb
index be5aa5a77..751fb2e10 100644
--- a/spec/models/form/sales/pages/mortgage_value_check_spec.rb
+++ b/spec/models/form/sales/pages/mortgage_value_check_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Form::Sales::Pages::MortgageValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/multiple_partners_value_check_spec.rb b/spec/models/form/sales/pages/multiple_partners_value_check_spec.rb
index e3ee322a5..cc0546c09 100644
--- a/spec/models/form/sales/pages/multiple_partners_value_check_spec.rb
+++ b/spec/models/form/sales/pages/multiple_partners_value_check_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Form::Sales::Pages::MultiplePartnersValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   context "with person 1" do
diff --git a/spec/models/form/sales/pages/no_address_found_spec.rb b/spec/models/form/sales/pages/no_address_found_spec.rb
index b6dbd677e..5fa19556d 100644
--- a/spec/models/form/sales/pages/no_address_found_spec.rb
+++ b/spec/models/form/sales/pages/no_address_found_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Pages::NoAddressFound, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has the correct title_text" do
diff --git a/spec/models/form/sales/pages/number_of_others_in_property_spec.rb b/spec/models/form/sales/pages/number_of_others_in_property_spec.rb
index b4e5f8ea9..fe036bf72 100644
--- a/spec/models/form/sales/pages/number_of_others_in_property_spec.rb
+++ b/spec/models/form/sales/pages/number_of_others_in_property_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Pages::NumberOfOthersInProperty, type: :model do
             let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0) }
 
             it "routes to the page" do
-              expect(page.routed_to?(log, nil)).to eq(true)
+              expect(page.routed_to?(log, nil)).to be(true)
             end
           end
 
@@ -52,7 +52,7 @@ RSpec.describe Form::Sales::Pages::NumberOfOthersInProperty, type: :model do
             let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 1) }
 
             it "routes to the page" do
-              expect(page.routed_to?(log, nil)).to eq(true)
+              expect(page.routed_to?(log, nil)).to be(true)
             end
           end
 
@@ -68,7 +68,7 @@ RSpec.describe Form::Sales::Pages::NumberOfOthersInProperty, type: :model do
             let(:log) { build(:sales_log, privacynotice: nil, jointpur: 1, noint: 1) }
 
             it "routes to the page" do
-              expect(page.routed_to?(log, nil)).to eq(true)
+              expect(page.routed_to?(log, nil)).to be(true)
             end
           end
         end
@@ -115,7 +115,7 @@ RSpec.describe Form::Sales::Pages::NumberOfOthersInProperty, type: :model do
           let(:log) { build(:sales_log, privacynotice: 1, jointpur: 1, noint: 0, staircase: 2) }
 
           it "routes to the page" do
-            expect(page.routed_to?(log, nil)).to eq(true)
+            expect(page.routed_to?(log, nil)).to be(true)
           end
         end
 
diff --git a/spec/models/form/sales/pages/owning_organisation_spec.rb b/spec/models/form/sales/pages/owning_organisation_spec.rb
index 3a9f1a900..b8ac16722 100644
--- a/spec/models/form/sales/pages/owning_organisation_spec.rb
+++ b/spec/models/form/sales/pages/owning_organisation_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Pages::OwningOrganisation, type: :model do
   end
 
   it "has the correct depends_on" do
-    expect(page.depends_on).to be nil
+    expect(page.depends_on).to be_nil
   end
 
   describe "#routed_to?" do
@@ -32,7 +32,7 @@ RSpec.describe Form::Sales::Pages::OwningOrganisation, type: :model do
 
     context "when user nil" do
       it "is not shown" do
-        expect(page.routed_to?(log, nil)).to eq(false)
+        expect(page.routed_to?(log, nil)).to be(false)
       end
 
       it "does not update owning_organisation_id" do
@@ -44,7 +44,7 @@ RSpec.describe Form::Sales::Pages::OwningOrganisation, type: :model do
       let(:user) { create(:user, :support) }
 
       it "is shown" do
-        expect(page.routed_to?(log, user)).to eq(true)
+        expect(page.routed_to?(log, user)).to be(true)
       end
 
       it "does not update owning_organisation_id" do
@@ -60,7 +60,7 @@ RSpec.describe Form::Sales::Pages::OwningOrganisation, type: :model do
 
         context "with 0 stock_owners" do
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
 
           it "does not update owning_organisation_id" do
@@ -80,7 +80,7 @@ RSpec.describe Form::Sales::Pages::OwningOrganisation, type: :model do
           end
 
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
 
           it "updates owning_organisation_id" do
@@ -106,7 +106,7 @@ RSpec.describe Form::Sales::Pages::OwningOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
       end
@@ -118,7 +118,7 @@ RSpec.describe Form::Sales::Pages::OwningOrganisation, type: :model do
 
         context "with 0 stock_owners" do
           it "is not shown" do
-            expect(page.routed_to?(log, user)).to eq(false)
+            expect(page.routed_to?(log, user)).to be(false)
           end
         end
 
@@ -129,7 +129,7 @@ RSpec.describe Form::Sales::Pages::OwningOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
 
@@ -141,7 +141,7 @@ RSpec.describe Form::Sales::Pages::OwningOrganisation, type: :model do
           end
 
           it "is shown" do
-            expect(page.routed_to?(log, user)).to eq(true)
+            expect(page.routed_to?(log, user)).to be(true)
           end
         end
       end
diff --git a/spec/models/form/sales/pages/partner_under16_value_check_spec.rb b/spec/models/form/sales/pages/partner_under16_value_check_spec.rb
index 5785ab900..4f0956d8f 100644
--- a/spec/models/form/sales/pages/partner_under16_value_check_spec.rb
+++ b/spec/models/form/sales/pages/partner_under16_value_check_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Form::Sales::Pages::PartnerUnder16ValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   context "with person 1" do
diff --git a/spec/models/form/sales/pages/percentage_discount_value_check_spec.rb b/spec/models/form/sales/pages/percentage_discount_value_check_spec.rb
index 0b8cf0152..fe8e2a480 100644
--- a/spec/models/form/sales/pages/percentage_discount_value_check_spec.rb
+++ b/spec/models/form/sales/pages/percentage_discount_value_check_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Pages::PercentageDiscountValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has correct depends_on" do
diff --git a/spec/models/form/sales/pages/person_gender_identity_spec.rb b/spec/models/form/sales/pages/person_gender_identity_spec.rb
index 9d7eff2f1..73cb734af 100644
--- a/spec/models/form/sales/pages/person_gender_identity_spec.rb
+++ b/spec/models/form/sales/pages/person_gender_identity_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Form::Sales::Pages::PersonGenderIdentity, type: :model do
     expect(page.description).to be_nil
   end
 
-  context "with person 2  " do
+  context "with person 2" do
     let(:person_index) { 2 }
     let(:page_id) { "person_2_gender_identity" }
 
diff --git a/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb b/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb
index 43ba0af49..c27d331c5 100644
--- a/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb
+++ b/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Form::Sales::Pages::PersonStudentNotChildValueCheck, type: :model
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has correct title_text" do
diff --git a/spec/models/form/sales/pages/retirement_value_check_spec.rb b/spec/models/form/sales/pages/retirement_value_check_spec.rb
index e316250b5..aa7222dbd 100644
--- a/spec/models/form/sales/pages/retirement_value_check_spec.rb
+++ b/spec/models/form/sales/pages/retirement_value_check_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Form::Sales::Pages::RetirementValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   context "with person 1" do
diff --git a/spec/models/form/sales/pages/sale_date_check_spec.rb b/spec/models/form/sales/pages/sale_date_check_spec.rb
index c8d9d4c5f..0adb9e2d4 100644
--- a/spec/models/form/sales/pages/sale_date_check_spec.rb
+++ b/spec/models/form/sales/pages/sale_date_check_spec.rb
@@ -38,6 +38,6 @@ RSpec.describe Form::Sales::Pages::SaleDateCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 end
diff --git a/spec/models/form/sales/pages/savings_value_check_spec.rb b/spec/models/form/sales/pages/savings_value_check_spec.rb
index c0e6fec29..9b73feee6 100644
--- a/spec/models/form/sales/pages/savings_value_check_spec.rb
+++ b/spec/models/form/sales/pages/savings_value_check_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe Form::Sales::Pages::SavingsValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has the correct interruption_screen_question_ids" do
diff --git a/spec/models/form/sales/pages/service_charge_spec.rb b/spec/models/form/sales/pages/service_charge_spec.rb
index ec23d9876..73fd4cdf8 100644
--- a/spec/models/form/sales/pages/service_charge_spec.rb
+++ b/spec/models/form/sales/pages/service_charge_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Pages::ServiceCharge, type: :model do
   end
 
   it "has the correct id" do
-    expect(page.id).to eq(nil)
+    expect(page.id).to be_nil
   end
 
   it "has the correct description" do
diff --git a/spec/models/form/sales/pages/staircase_owned_value_check_spec.rb b/spec/models/form/sales/pages/staircase_owned_value_check_spec.rb
index 5fa65fd8d..f0fb62674 100644
--- a/spec/models/form/sales/pages/staircase_owned_value_check_spec.rb
+++ b/spec/models/form/sales/pages/staircase_owned_value_check_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Form::Sales::Pages::StaircaseOwnedValueCheck, type: :model do
   end
 
   it "is interruption screen page" do
-    expect(page.interruption_screen?).to eq(true)
+    expect(page.interruption_screen?).to be(true)
   end
 
   it "has the correct informative_text" do
diff --git a/spec/models/form/sales/pages/uprn_confirmation_spec.rb b/spec/models/form/sales/pages/uprn_confirmation_spec.rb
index 6415c2eb0..cd5e41d82 100644
--- a/spec/models/form/sales/pages/uprn_confirmation_spec.rb
+++ b/spec/models/form/sales/pages/uprn_confirmation_spec.rb
@@ -32,13 +32,13 @@ RSpec.describe Form::Sales::Pages::UprnConfirmation, type: :model do
   end
 
   describe "has correct routed_to?" do
-    context "when uprn present && uprn_known == 1 " do
+    context "when uprn present && uprn_known == 1" do
       let(:log) { build(:sales_log) }
 
       it "returns true" do
         log.uprn_known = 1
         log.uprn = "123456789"
-        expect(page.routed_to?(log)).to eq(true)
+        expect(page.routed_to?(log)).to be(true)
       end
     end
 
@@ -46,7 +46,7 @@ RSpec.describe Form::Sales::Pages::UprnConfirmation, type: :model do
       let(:log) { build(:sales_log, uprn_known: 1, uprn: nil) }
 
       it "returns false" do
-        expect(page.routed_to?(log)).to eq(false)
+        expect(page.routed_to?(log)).to be(false)
       end
     end
 
@@ -54,7 +54,7 @@ RSpec.describe Form::Sales::Pages::UprnConfirmation, type: :model do
       let(:log) { build(:sales_log, uprn_known: 0, uprn: "123456789") }
 
       it "returns false" do
-        expect(page.routed_to?(log)).to eq(false)
+        expect(page.routed_to?(log)).to be(false)
       end
     end
   end
diff --git a/spec/models/form/sales/pages/uprn_selection_spec.rb b/spec/models/form/sales/pages/uprn_selection_spec.rb
index 22e95bdf4..2afad201a 100644
--- a/spec/models/form/sales/pages/uprn_selection_spec.rb
+++ b/spec/models/form/sales/pages/uprn_selection_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Form::Sales::Pages::UprnSelection, type: :model do
   end
 
   it "has the correct skip text" do
-    "Search for address again"
+    expect(page.skip_text).to eq("Search for address again")
   end
 
   it "has the correct skip_href" 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 067b78717..fa82d28f4 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
@@ -21,7 +21,7 @@ RSpec.describe Form::Sales::Questions::AddressLine1ForAddressMatcher, type: :mod
   end
 
   it "has the correct question_number" do
-    expect(question.question_number).to eq(nil)
+    expect(question.question_number).to be_nil
   end
 
   it "has the correct type" do
@@ -45,6 +45,6 @@ RSpec.describe Form::Sales::Questions::AddressLine1ForAddressMatcher, type: :mod
   end
 
   it "has the correct disable_clearing_if_not_routed_or_dynamic_answer_options value" do
-    expect(question.disable_clearing_if_not_routed_or_dynamic_answer_options).to eq(true)
+    expect(question.disable_clearing_if_not_routed_or_dynamic_answer_options).to be(true)
   end
 end
diff --git a/spec/models/form/sales/questions/address_line2_spec.rb b/spec/models/form/sales/questions/address_line2_spec.rb
index 153582204..a91d4e1f6 100644
--- a/spec/models/form/sales/questions/address_line2_spec.rb
+++ b/spec/models/form/sales/questions/address_line2_spec.rb
@@ -34,6 +34,6 @@ RSpec.describe Form::Sales::Questions::AddressLine2, type: :model do
   end
 
   it "has the correct hidden_in_check_answers" do
-    expect(question.hidden_in_check_answers?).to eq(true)
+    expect(question.hidden_in_check_answers?).to be(true)
   end
 end
diff --git a/spec/models/form/sales/questions/buyer_previous_spec.rb b/spec/models/form/sales/questions/buyer_previous_spec.rb
index 88204ad1a..e312b4f4e 100644
--- a/spec/models/form/sales/questions/buyer_previous_spec.rb
+++ b/spec/models/form/sales/questions/buyer_previous_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe Form::Sales::Questions::BuyerPrevious, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 
   context "when form year is before 2024" do
diff --git a/spec/models/form/sales/questions/combined_income_value_check_spec.rb b/spec/models/form/sales/questions/combined_income_value_check_spec.rb
index 5ddacfff5..459d121b1 100644
--- a/spec/models/form/sales/questions/combined_income_value_check_spec.rb
+++ b/spec/models/form/sales/questions/combined_income_value_check_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Questions::CombinedIncomeValueCheck, type: :model do
   end
 
   it "has a correct check_answers_card_number" do
-    expect(question.check_answers_card_number).to eq(nil)
+    expect(question.check_answers_card_number).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/deposit_amount_spec.rb b/spec/models/form/sales/questions/deposit_amount_spec.rb
index 95404971a..6dd019b67 100644
--- a/spec/models/form/sales/questions/deposit_amount_spec.rb
+++ b/spec/models/form/sales/questions/deposit_amount_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe Form::Sales::Questions::DepositAmount, type: :model do
     context "when a mortgage is used" do
       let(:mortgageused) { 1 }
 
-      it "is not marked as derived " do
+      it "is not marked as derived" do
         expect(question.derived?(log)).to be false
       end
     end
@@ -38,7 +38,7 @@ RSpec.describe Form::Sales::Questions::DepositAmount, type: :model do
     context "when a mortgage is not used" do
       let(:mortgageused) { 2 }
 
-      it "is marked as derived " do
+      it "is marked as derived" do
         expect(question.derived?(log)).to be true
       end
     end
@@ -46,7 +46,7 @@ RSpec.describe Form::Sales::Questions::DepositAmount, type: :model do
     context "when the mortgage use is unknown" do
       let(:mortgageused) { 3 }
 
-      it "is marked as derived " do
+      it "is marked as derived" do
         expect(question.derived?(log)).to be true
       end
     end
diff --git a/spec/models/form/sales/questions/discounted_ownership_type_spec.rb b/spec/models/form/sales/questions/discounted_ownership_type_spec.rb
index 43ecb4ac5..356367f0b 100644
--- a/spec/models/form/sales/questions/discounted_ownership_type_spec.rb
+++ b/spec/models/form/sales/questions/discounted_ownership_type_spec.rb
@@ -46,8 +46,8 @@ RSpec.describe Form::Sales::Questions::DiscountedOwnershipType, type: :model do
       end
 
       it "is at the top" do
-        expect(question.top_guidance?).to eq(true)
-        expect(question.bottom_guidance?).to eq(false)
+        expect(question.top_guidance?).to be(true)
+        expect(question.bottom_guidance?).to be(false)
       end
     end
 
@@ -55,7 +55,7 @@ RSpec.describe Form::Sales::Questions::DiscountedOwnershipType, type: :model do
       let(:start_date) { Time.zone.local(2022, 4, 8) }
 
       it "does not show a top_guidance_partial" do
-        expect(question.top_guidance_partial).to eq(nil)
+        expect(question.top_guidance_partial).to be_nil
       end
     end
   end
diff --git a/spec/models/form/sales/questions/extra_borrowing_spec.rb b/spec/models/form/sales/questions/extra_borrowing_spec.rb
index e66b7d24e..935140914 100644
--- a/spec/models/form/sales/questions/extra_borrowing_spec.rb
+++ b/spec/models/form/sales/questions/extra_borrowing_spec.rb
@@ -33,6 +33,6 @@ RSpec.describe Form::Sales::Questions::ExtraBorrowing, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/housing_benefits_spec.rb b/spec/models/form/sales/questions/housing_benefits_spec.rb
index 97d896fe7..e9fef0013 100644
--- a/spec/models/form/sales/questions/housing_benefits_spec.rb
+++ b/spec/models/form/sales/questions/housing_benefits_spec.rb
@@ -11,8 +11,7 @@ RSpec.describe Form::Sales::Questions::HousingBenefits, type: :model do
   let(:joint_purchase) { false }
 
   before do
-    allow(form).to receive(:start_year_2026_or_later?).and_return(true)
-    allow(form).to receive(:start_date).and_return(Time.zone.local(2023, 4, 1))
+    allow(form).to receive_messages(start_year_2026_or_later?: true, start_date: Time.zone.local(2023, 4, 1))
     allow(page).to receive(:subsection).and_return(subsection)
     allow(subsection).to receive(:form).and_return(form)
   end
diff --git a/spec/models/form/sales/questions/la_nominations_spec.rb b/spec/models/form/sales/questions/la_nominations_spec.rb
index a6baedcc8..cda125253 100644
--- a/spec/models/form/sales/questions/la_nominations_spec.rb
+++ b/spec/models/form/sales/questions/la_nominations_spec.rb
@@ -33,6 +33,6 @@ RSpec.describe Form::Sales::Questions::LaNominations, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/mortgageused_spec.rb b/spec/models/form/sales/questions/mortgageused_spec.rb
index bf064d980..93ce3ed4c 100644
--- a/spec/models/form/sales/questions/mortgageused_spec.rb
+++ b/spec/models/form/sales/questions/mortgageused_spec.rb
@@ -17,8 +17,7 @@ RSpec.describe Form::Sales::Questions::Mortgageused, type: :model do
     let(:ownershipsch) { 1 }
 
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return true
-      allow(form).to receive(:start_year_2025_or_later?).and_return false
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false)
     end
 
     it "has the correct answer_options" do
@@ -99,8 +98,7 @@ RSpec.describe Form::Sales::Questions::Mortgageused, type: :model do
     let(:saledate) { Time.zone.local(2025, 5, 1) }
 
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return true
-      allow(form).to receive(:start_year_2025_or_later?).and_return true
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true)
     end
 
     context "when it is a discounted ownership sale" do
@@ -121,7 +119,7 @@ RSpec.describe Form::Sales::Questions::Mortgageused, type: :model do
       context "and it is a staircasing transaction" do
         let(:staircase) { 1 }
 
-        it "does  show the don't know option" do
+        it "does show the don't know option" do
           expect_the_question_to_show_dont_know
         end
 
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 7dd47a1ee..f33ca7910 100644
--- a/spec/models/form/sales/questions/no_address_found_spec.rb
+++ b/spec/models/form/sales/questions/no_address_found_spec.rb
@@ -27,6 +27,6 @@ RSpec.describe Form::Sales::Questions::NoAddressFound, type: :model do
   end
 
   it "has the correct hidden_in_check_answers" do
-    expect(question.hidden_in_check_answers).to eq(true)
+    expect(question.hidden_in_check_answers).to be(true)
   end
 end
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 0ee30556c..2a4c29db1 100644
--- a/spec/models/form/sales/questions/outright_ownership_type_spec.rb
+++ b/spec/models/form/sales/questions/outright_ownership_type_spec.rb
@@ -51,8 +51,8 @@ RSpec.describe Form::Sales::Questions::OutrightOwnershipType, type: :model do
       end
 
       it "is at the top" do
-        expect(question.top_guidance?).to eq(true)
-        expect(question.bottom_guidance?).to eq(false)
+        expect(question.top_guidance?).to be(true)
+        expect(question.bottom_guidance?).to be(false)
       end
     end
 
@@ -60,11 +60,11 @@ RSpec.describe Form::Sales::Questions::OutrightOwnershipType, type: :model do
       let(:start_date) { Time.zone.local(2022, 4, 8) }
 
       it "does not display a top guidance partial" do
-        expect(question.top_guidance_partial).to eq(nil)
+        expect(question.top_guidance_partial).to be_nil
       end
 
       it "does not display a bottom guidance partial" do
-        expect(question.bottom_guidance_partial).to eq(nil)
+        expect(question.bottom_guidance_partial).to be_nil
       end
     end
   end
diff --git a/spec/models/form/sales/questions/ownership_scheme_spec.rb b/spec/models/form/sales/questions/ownership_scheme_spec.rb
index 656adc0e5..27cadac5e 100644
--- a/spec/models/form/sales/questions/ownership_scheme_spec.rb
+++ b/spec/models/form/sales/questions/ownership_scheme_spec.rb
@@ -10,8 +10,7 @@ RSpec.describe Form::Sales::Questions::OwnershipScheme, type: :model do
   let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
-    allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-    allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+    allow(form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false)
     allow(page).to receive(:subsection).and_return(subsection)
     allow(subsection).to receive(:form).and_return(form)
   end
@@ -56,8 +55,7 @@ RSpec.describe Form::Sales::Questions::OwnershipScheme, type: :model do
 
   context "with collection year on or after 2025" do
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+      allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true)
     end
 
     it "has the correct answer_options" do
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 63f3601f2..5436bca96 100644
--- a/spec/models/form/sales/questions/owning_organisation_id_spec.rb
+++ b/spec/models/form/sales/questions/owning_organisation_id_spec.rb
@@ -300,9 +300,9 @@ RSpec.describe Form::Sales::Questions::OwningOrganisationId, type: :model do
       answers = question.displayed_answer_options(lettings_log).map { |key, value| OpenStruct.new(id: key, name: nil, resource: value) }
       answers.each do |answer|
         if answer.resource == "Select an option"
-          expect(question.answer_selected?(lettings_log, answer)).to eq(true)
+          expect(question.answer_selected?(lettings_log, answer)).to be(true)
         else
-          expect(question.answer_selected?(lettings_log, answer)).to eq(false)
+          expect(question.answer_selected?(lettings_log, answer)).to be(false)
         end
       end
     end
@@ -314,9 +314,9 @@ RSpec.describe Form::Sales::Questions::OwningOrganisationId, type: :model do
       answers = question.displayed_answer_options(lettings_log).map { |key, value| OpenStruct.new(id: key, name: value.respond_to?(:service_name) ? value.service_name : nil, resource: value) }
       answers.each do |answer|
         if answer.id == organisation_1.id
-          expect(question.answer_selected?(lettings_log, answer)).to eq(true)
+          expect(question.answer_selected?(lettings_log, answer)).to be(true)
         else
-          expect(question.answer_selected?(lettings_log, answer)).to eq(false)
+          expect(question.answer_selected?(lettings_log, answer)).to be(false)
         end
       end
     end
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 dacccefc3..a136c5956 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
@@ -17,7 +17,7 @@ RSpec.describe Form::Sales::Questions::PostcodeForAddressMatcher, type: :model d
   end
 
   it "has the correct question_number" do
-    expect(question.question_number).to eq(nil)
+    expect(question.question_number).to be_nil
   end
 
   it "has the correct type" do
@@ -45,6 +45,6 @@ RSpec.describe Form::Sales::Questions::PostcodeForAddressMatcher, type: :model d
   end
 
   it "has the correct disable_clearing_if_not_routed_or_dynamic_answer_options value" do
-    expect(question.disable_clearing_if_not_routed_or_dynamic_answer_options).to eq(true)
+    expect(question.disable_clearing_if_not_routed_or_dynamic_answer_options).to be(true)
   end
 end
diff --git a/spec/models/form/sales/questions/prevown_spec.rb b/spec/models/form/sales/questions/prevown_spec.rb
index 73b6063c1..d0a7e14d2 100644
--- a/spec/models/form/sales/questions/prevown_spec.rb
+++ b/spec/models/form/sales/questions/prevown_spec.rb
@@ -34,6 +34,6 @@ RSpec.describe Form::Sales::Questions::Prevown, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/prevshared_spec.rb b/spec/models/form/sales/questions/prevshared_spec.rb
index 889a7c92c..6661ed5d2 100644
--- a/spec/models/form/sales/questions/prevshared_spec.rb
+++ b/spec/models/form/sales/questions/prevshared_spec.rb
@@ -33,6 +33,6 @@ RSpec.describe Form::Sales::Questions::Prevshared, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/property_local_authority_spec.rb b/spec/models/form/sales/questions/property_local_authority_spec.rb
index fcdd81d29..88458cbc5 100644
--- a/spec/models/form/sales/questions/property_local_authority_spec.rb
+++ b/spec/models/form/sales/questions/property_local_authority_spec.rb
@@ -655,7 +655,7 @@ RSpec.describe Form::Sales::Questions::PropertyLocalAuthority, type: :model do
       let(:log) { build(:sales_log, saledate: Time.zone.parse("2022-07-01")) }
 
       it "returns false" do
-        expect(question.hidden_in_check_answers?(log)).to eq(false)
+        expect(question.hidden_in_check_answers?(log)).to be(false)
       end
     end
 
@@ -663,7 +663,7 @@ RSpec.describe Form::Sales::Questions::PropertyLocalAuthority, type: :model do
       let(:log) { build(:sales_log, saledate: Time.zone.parse("2023-07-01")) }
 
       it "returns true" do
-        expect(question.hidden_in_check_answers?(log)).to eq(false)
+        expect(question.hidden_in_check_answers?(log)).to be(false)
       end
     end
 
@@ -675,7 +675,7 @@ RSpec.describe Form::Sales::Questions::PropertyLocalAuthority, type: :model do
       end
 
       it "returns true" do
-        expect(question.hidden_in_check_answers?(log)).to eq(true)
+        expect(question.hidden_in_check_answers?(log)).to be(true)
       end
     end
   end
diff --git a/spec/models/form/sales/questions/resale_spec.rb b/spec/models/form/sales/questions/resale_spec.rb
index a6583a930..6293a7175 100644
--- a/spec/models/form/sales/questions/resale_spec.rb
+++ b/spec/models/form/sales/questions/resale_spec.rb
@@ -31,6 +31,6 @@ RSpec.describe Form::Sales::Questions::Resale, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/staircase_bought_spec.rb b/spec/models/form/sales/questions/staircase_bought_spec.rb
index d448e4456..ab8f195ce 100644
--- a/spec/models/form/sales/questions/staircase_bought_spec.rb
+++ b/spec/models/form/sales/questions/staircase_bought_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::StaircaseBought, type: :model do
   end
 
   it "has the correct inferred check answers value" do
-    expect(question.inferred_check_answers_value).to eq(nil)
+    expect(question.inferred_check_answers_value).to be_nil
   end
 
   it "has correct suffix" do
diff --git a/spec/models/form/sales/questions/staircase_count_spec.rb b/spec/models/form/sales/questions/staircase_count_spec.rb
index 06f39b3d0..ebef306ad 100644
--- a/spec/models/form/sales/questions/staircase_count_spec.rb
+++ b/spec/models/form/sales/questions/staircase_count_spec.rb
@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Questions::StaircaseCount, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/staircase_first_time_spec.rb b/spec/models/form/sales/questions/staircase_first_time_spec.rb
index 59d0281a2..4f96c1757 100644
--- a/spec/models/form/sales/questions/staircase_first_time_spec.rb
+++ b/spec/models/form/sales/questions/staircase_first_time_spec.rb
@@ -35,6 +35,6 @@ RSpec.describe Form::Sales::Questions::StaircaseFirstTime, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/staircase_initial_date_spec.rb b/spec/models/form/sales/questions/staircase_initial_date_spec.rb
index 3c244e512..0b31350cf 100644
--- a/spec/models/form/sales/questions/staircase_initial_date_spec.rb
+++ b/spec/models/form/sales/questions/staircase_initial_date_spec.rb
@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Questions::StaircaseInitialDate, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/staircase_last_date_spec.rb b/spec/models/form/sales/questions/staircase_last_date_spec.rb
index 2efa5ccc7..36d8b1fe6 100644
--- a/spec/models/form/sales/questions/staircase_last_date_spec.rb
+++ b/spec/models/form/sales/questions/staircase_last_date_spec.rb
@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Questions::StaircaseLastDate, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/staircase_owned_spec.rb b/spec/models/form/sales/questions/staircase_owned_spec.rb
index 94d1eac6f..30239e162 100644
--- a/spec/models/form/sales/questions/staircase_owned_spec.rb
+++ b/spec/models/form/sales/questions/staircase_owned_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Form::Sales::Questions::StaircaseOwned, type: :model do
   end
 
   it "has the correct inferred check answers value" do
-    expect(question.inferred_check_answers_value).to eq(nil)
+    expect(question.inferred_check_answers_value).to be_nil
   end
 
   it "has correct suffix" do
diff --git a/spec/models/form/sales/questions/staircase_owned_value_check_spec.rb b/spec/models/form/sales/questions/staircase_owned_value_check_spec.rb
index cbff9cec1..11b4fe2c8 100644
--- a/spec/models/form/sales/questions/staircase_owned_value_check_spec.rb
+++ b/spec/models/form/sales/questions/staircase_owned_value_check_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Questions::StaircaseOwnedValueCheck, type: :model do
   end
 
   it "has a correct check_answers_card_number" do
-    expect(question.check_answers_card_number).to eq(nil)
+    expect(question.check_answers_card_number).to be_nil
   end
 
   it "has the correct answer_options" do
diff --git a/spec/models/form/sales/questions/staircase_sale_spec.rb b/spec/models/form/sales/questions/staircase_sale_spec.rb
index f26e8a376..789f84afa 100644
--- a/spec/models/form/sales/questions/staircase_sale_spec.rb
+++ b/spec/models/form/sales/questions/staircase_sale_spec.rb
@@ -37,6 +37,6 @@ RSpec.describe Form::Sales::Questions::StaircaseSale, type: :model do
   end
 
   it "has correct conditional for" do
-    expect(question.conditional_for).to eq(nil)
+    expect(question.conditional_for).to be_nil
   end
 end
diff --git a/spec/models/form/sales/questions/staircase_spec.rb b/spec/models/form/sales/questions/staircase_spec.rb
index 96c6fb31c..876e2dfb8 100644
--- a/spec/models/form/sales/questions/staircase_spec.rb
+++ b/spec/models/form/sales/questions/staircase_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe Form::Sales::Questions::Staircase, type: :model do
     end
 
     it "has correct conditional for" do
-      expect(question.conditional_for).to eq(nil)
+      expect(question.conditional_for).to be_nil
     end
   end
 
diff --git a/spec/models/form/sales/questions/uprn_confirmation_spec.rb b/spec/models/form/sales/questions/uprn_confirmation_spec.rb
index c6f7fd723..c5dc4b100 100644
--- a/spec/models/form/sales/questions/uprn_confirmation_spec.rb
+++ b/spec/models/form/sales/questions/uprn_confirmation_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe Form::Sales::Questions::UprnConfirmation, type: :model do
       let(:log) { build(:sales_log, uprn_known: 0, uprn_confirmed: nil) }
 
       it "returns true" do
-        expect(question.hidden_in_check_answers?(log)).to eq(true)
+        expect(question.hidden_in_check_answers?(log)).to be(true)
       end
     end
 
@@ -64,7 +64,7 @@ RSpec.describe Form::Sales::Questions::UprnConfirmation, type: :model do
         log.uprn_known = 1
         log.uprn = "12345"
         log.uprn_confirmed = nil
-        expect(question.hidden_in_check_answers?(log)).to eq(false)
+        expect(question.hidden_in_check_answers?(log)).to be(false)
       end
     end
 
@@ -72,7 +72,7 @@ RSpec.describe Form::Sales::Questions::UprnConfirmation, type: :model do
       let(:log) { build(:sales_log, uprn_known: 1, uprn: "12345", uprn_confirmed: 1) }
 
       it "returns true" do
-        expect(question.hidden_in_check_answers?(log)).to eq(true)
+        expect(question.hidden_in_check_answers?(log)).to be(true)
       end
     end
   end
diff --git a/spec/models/form/sales/questions/uprn_selection_spec.rb b/spec/models/form/sales/questions/uprn_selection_spec.rb
index efcf39c67..2320d7e64 100644
--- a/spec/models/form/sales/questions/uprn_selection_spec.rb
+++ b/spec/models/form/sales/questions/uprn_selection_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Form::Sales::Questions::UprnSelection, type: :model do
   end
 
   it "has the correct question_number" do
-    expect(question.question_number).to eq(nil)
+    expect(question.question_number).to be_nil
   end
 
   it "has the correct type" do
@@ -71,7 +71,7 @@ RSpec.describe Form::Sales::Questions::UprnSelection, type: :model do
       stub_request(:get, /api\.os\.uk/)
         .to_return(status: 200, body: '{"results": {"0": "address_0", "1": "address_1", "2": "address_2"}}', headers: {})
 
-      expect(question.hidden_in_check_answers?(log)).to eq(false)
+      expect(question.hidden_in_check_answers?(log)).to be(false)
     end
   end
 
@@ -84,7 +84,7 @@ RSpec.describe Form::Sales::Questions::UprnSelection, type: :model do
       stub_request(:get, /api\.os\.uk/)
         .to_return(status: 200, body: "", headers: {})
 
-      expect(question.hidden_in_check_answers?(log)).to eq(true)
+      expect(question.hidden_in_check_answers?(log)).to be(true)
     end
   end
 
diff --git a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb
index 3fa57571b..1420564ae 100644
--- a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb
+++ b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb
@@ -76,7 +76,7 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model
     let(:log) { FactoryBot.build(:sales_log, ownershipsch: 2) }
 
     it "is displayed in tasklist" do
-      expect(discounted_ownership_scheme.displayed_in_tasklist?(log)).to eq(true)
+      expect(discounted_ownership_scheme.displayed_in_tasklist?(log)).to be(true)
     end
   end
 
@@ -84,7 +84,7 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model
     let(:log) { FactoryBot.build(:sales_log, ownershipsch: 1) }
 
     it "is displayed in tasklist" do
-      expect(discounted_ownership_scheme.displayed_in_tasklist?(log)).to eq(false)
+      expect(discounted_ownership_scheme.displayed_in_tasklist?(log)).to be(false)
     end
   end
 
diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb
index 74ed15da4..58ce2ce5f 100644
--- a/spec/models/form/sales/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb
@@ -18,10 +18,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
 
   context "with 2023/24 form" do
     before do
-      allow(form).to receive(:start_date).and_return(Time.zone.local(2023, 4, 1))
-      allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(false)
-      allow(form).to receive(:start_year_2026_or_later?).and_return(false)
+      allow(form).to receive_messages(start_date: Time.zone.local(2023, 4, 1), start_year_2024_or_later?: false, start_year_2025_or_later?: false, start_year_2026_or_later?: false)
     end
 
     it "has correct pages" do
@@ -128,10 +125,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
 
   context "with 2024/25 form" do
     before do
-      allow(form).to receive(:start_date).and_return(Time.zone.local(2024, 4, 1))
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(false)
-      allow(form).to receive(:start_year_2026_or_later?).and_return(false)
+      allow(form).to receive_messages(start_date: Time.zone.local(2024, 4, 1), start_year_2024_or_later?: true, start_year_2025_or_later?: false, start_year_2026_or_later?: false)
     end
 
     it "has correct depends on" do
@@ -142,7 +136,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
       let(:log) { FactoryBot.build(:sales_log, ownershipsch: 3, companybuy: 1) }
 
       it "is not displayed in tasklist" do
-        expect(household_characteristics.displayed_in_tasklist?(log)).to eq(false)
+        expect(household_characteristics.displayed_in_tasklist?(log)).to be(false)
       end
     end
 
@@ -150,7 +144,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
       let(:log) { FactoryBot.build(:sales_log, ownershipsch: 3, companybuy: 2) }
 
       it "is displayed in tasklist" do
-        expect(household_characteristics.displayed_in_tasklist?(log)).to eq(true)
+        expect(household_characteristics.displayed_in_tasklist?(log)).to be(true)
       end
     end
 
@@ -283,10 +277,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
 
   context "with 2025/26 form" do
     before do
-      allow(form).to receive(:start_date).and_return(Time.zone.local(2025, 4, 1))
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2026_or_later?).and_return(false)
+      allow(form).to receive_messages(start_date: Time.zone.local(2025, 4, 1), start_year_2024_or_later?: true, start_year_2025_or_later?: true, start_year_2026_or_later?: false)
     end
 
     it "has correct pages" do
@@ -404,10 +395,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
 
   context "with 2026/27 form" do
     before do
-      allow(form).to receive(:start_date).and_return(Time.zone.local(2026, 4, 1))
-      allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(true)
-      allow(form).to receive(:start_year_2026_or_later?).and_return(true)
+      allow(form).to receive_messages(start_date: Time.zone.local(2026, 4, 1), start_year_2024_or_later?: true, start_year_2025_or_later?: true, start_year_2026_or_later?: true)
     end
 
     it "has correct pages" do
diff --git a/spec/models/form/sales/subsections/outright_sale_spec.rb b/spec/models/form/sales/subsections/outright_sale_spec.rb
index b91553939..d7a79a01e 100644
--- a/spec/models/form/sales/subsections/outright_sale_spec.rb
+++ b/spec/models/form/sales/subsections/outright_sale_spec.rb
@@ -21,8 +21,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
 
     context "when 2022" do
       before do
-        allow(form).to receive(:start_date).and_return(Time.zone.local(2022, 2, 8))
-        allow(form).to receive(:start_year_2024_or_later?).and_return(false)
+        allow(form).to receive_messages(start_date: Time.zone.local(2022, 2, 8), start_year_2024_or_later?: false)
       end
 
       it "has correct pages" do
@@ -49,9 +48,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
 
     context "when 2023" do
       before do
-        allow(form).to receive(:start_date).and_return(Time.zone.local(2023, 2, 8))
-
-        allow(form).to receive(:start_year_2024_or_later?).and_return(false)
+        allow(form).to receive_messages(start_date: Time.zone.local(2023, 2, 8), start_year_2024_or_later?: false)
       end
 
       it "has correct pages" do
@@ -79,8 +76,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
 
     context "when 2024" do
       before do
-        allow(form).to receive(:start_date).and_return(Time.zone.local(2024, 2, 8))
-        allow(form).to receive(:start_year_2024_or_later?).and_return(true)
+        allow(form).to receive_messages(start_date: Time.zone.local(2024, 2, 8), start_year_2024_or_later?: true)
       end
 
       it "has correct pages" do
@@ -129,7 +125,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
     let(:log) { FactoryBot.build(:sales_log, ownershipsch: 3) }
 
     it "is displayed in tasklist" do
-      expect(outright_sale.displayed_in_tasklist?(log)).to eq(true)
+      expect(outright_sale.displayed_in_tasklist?(log)).to be(true)
     end
   end
 
@@ -137,7 +133,7 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
     let(:log) { FactoryBot.build(:sales_log, ownershipsch: 2) }
 
     it "is displayed in tasklist" do
-      expect(outright_sale.displayed_in_tasklist?(log)).to eq(false)
+      expect(outright_sale.displayed_in_tasklist?(log)).to be(false)
     end
   end
 end
diff --git a/spec/models/form/sales/subsections/property_information_spec.rb b/spec/models/form/sales/subsections/property_information_spec.rb
index 7585d290a..acc5b56a3 100644
--- a/spec/models/form/sales/subsections/property_information_spec.rb
+++ b/spec/models/form/sales/subsections/property_information_spec.rb
@@ -14,8 +14,7 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do
     let(:form) { instance_double(Form, start_date:) }
 
     before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+      allow(form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false)
     end
 
     context "when 2023" do
@@ -48,8 +47,7 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do
       let(:start_date) { Time.utc(2024, 2, 8) }
 
       before do
-        allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-        allow(form).to receive(:start_year_2025_or_later?).and_return(false)
+        allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false)
       end
 
       it "has correct pages" do
@@ -78,8 +76,7 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do
       let(:start_date) { Time.utc(2025, 2, 8) }
 
       before do
-        allow(form).to receive(:start_year_2024_or_later?).and_return(true)
-        allow(form).to receive(:start_year_2025_or_later?).and_return(true)
+        allow(form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true)
       end
 
       it "has correct pages" do
diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb
index 87f848c91..708c96806 100644
--- a/spec/models/form/sales/subsections/setup_spec.rb
+++ b/spec/models/form/sales/subsections/setup_spec.rb
@@ -22,8 +22,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
 
   context "when start year is before 2024" do
     before do
-      allow(section.form).to receive(:start_year_2024_or_later?).and_return(false)
-      allow(section.form).to receive(:start_year_2025_or_later?).and_return(false)
+      allow(section.form).to receive_messages(start_year_2024_or_later?: false, start_year_2025_or_later?: false)
     end
 
     it "has correct pages" do
@@ -49,8 +48,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
 
   context "when start year is 2024" do
     before do
-      allow(section.form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(section.form).to receive(:start_year_2025_or_later?).and_return(false)
+      allow(section.form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: false)
     end
 
     it "has correct pages" do
@@ -80,8 +78,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
 
   context "when start year is >= 2025" do
     before do
-      allow(section.form).to receive(:start_year_2024_or_later?).and_return(true)
-      allow(section.form).to receive(:start_year_2025_or_later?).and_return(true)
+      allow(section.form).to receive_messages(start_year_2024_or_later?: true, start_year_2025_or_later?: true)
     end
 
     it "has correct pages" do
diff --git a/spec/models/form/sales/subsections/shared_ownership_initial_purchase_spec.rb b/spec/models/form/sales/subsections/shared_ownership_initial_purchase_spec.rb
index 2f6c8f034..e60ff58dd 100644
--- a/spec/models/form/sales/subsections/shared_ownership_initial_purchase_spec.rb
+++ b/spec/models/form/sales/subsections/shared_ownership_initial_purchase_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipInitialPurchase, type: :
     let(:log) { FactoryBot.build(:sales_log, ownershipsch: 1, staircase: 2) }
 
     it "is displayed in tasklist" do
-      expect(shared_ownership_initial_purchase.displayed_in_tasklist?(log)).to eq(true)
+      expect(shared_ownership_initial_purchase.displayed_in_tasklist?(log)).to be(true)
     end
   end
 
@@ -81,7 +81,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipInitialPurchase, type: :
     let(:log) { FactoryBot.build(:sales_log, ownershipsch: 2, staircase: 2) }
 
     it "is displayed in tasklist" do
-      expect(shared_ownership_initial_purchase.displayed_in_tasklist?(log)).to eq(false)
+      expect(shared_ownership_initial_purchase.displayed_in_tasklist?(log)).to be(false)
     end
   end
 
@@ -89,7 +89,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipInitialPurchase, type: :
     let(:log) { FactoryBot.build(:sales_log, ownershipsch: 1, staircase: 1) }
 
     it "is displayed in tasklist" do
-      expect(shared_ownership_initial_purchase.displayed_in_tasklist?(log)).to eq(false)
+      expect(shared_ownership_initial_purchase.displayed_in_tasklist?(log)).to be(false)
     end
   end
 end
diff --git a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
index 51e2ee60d..0b6904508 100644
--- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
+++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
@@ -85,7 +85,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do
     let(:log) { FactoryBot.build(:sales_log, ownershipsch: 1) }
 
     it "is displayed in tasklist" do
-      expect(shared_ownership_scheme.displayed_in_tasklist?(log)).to eq(true)
+      expect(shared_ownership_scheme.displayed_in_tasklist?(log)).to be(true)
     end
   end
 
@@ -93,7 +93,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do
     let(:log) { FactoryBot.build(:sales_log, ownershipsch: 2) }
 
     it "is displayed in tasklist" do
-      expect(shared_ownership_scheme.displayed_in_tasklist?(log)).to eq(false)
+      expect(shared_ownership_scheme.displayed_in_tasklist?(log)).to be(false)
     end
   end
 end
diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb
index 74594c9b9..0fa571f33 100644
--- a/spec/models/form_spec.rb
+++ b/spec/models/form_spec.rb
@@ -247,7 +247,7 @@ RSpec.describe Form, type: :model do
           it "the value of this attribute is cleared" do
             log.renewal = 1
             log.form.reset_not_routed_questions_and_invalid_answers(log)
-            expect(log.prevten).to be nil
+            expect(log.prevten).to be_nil
           end
         end
       end
@@ -271,7 +271,7 @@ RSpec.describe Form, type: :model do
 
           it "the value of this attribute is cleared" do
             log.update!(startdate: Time.zone.local(2023, 1, 1))
-            expect(log.sheltered).to be nil
+            expect(log.sheltered).to be_nil
           end
         end
       end
@@ -310,7 +310,7 @@ RSpec.describe Form, type: :model do
           expect(log.value).to eq initial_value
           log.ownershipsch = 2
           log.form.reset_not_routed_questions_and_invalid_answers(log)
-          expect(log.value).to be nil
+          expect(log.value).to be_nil
         end
       end
     end
@@ -322,9 +322,9 @@ RSpec.describe Form, type: :model do
         expect(log.rp_homeless).to be 1
         log.reasonpref = 2
         log.form.reset_not_routed_questions_and_invalid_answers(log)
-        expect(log.rp_homeless).to be nil
-        expect(log.rp_medwel).to be nil
-        expect(log.rp_hardship).to be nil
+        expect(log.rp_homeless).to be_nil
+        expect(log.rp_medwel).to be_nil
+        expect(log.rp_hardship).to be_nil
       end
     end
 
@@ -341,12 +341,12 @@ RSpec.describe Form, type: :model do
         expect(log.ecstat2).to be 6
 
         log.update!(hhmemb: 1)
-        expect(log.details_known_2).to be nil
-        expect(log.sex2).to be nil
-        expect(log.relat2).to be nil
-        expect(log.age2_known).to be nil
-        expect(log.age2).to be nil
-        expect(log.ecstat2).to be nil
+        expect(log.details_known_2).to be_nil
+        expect(log.sex2).to be_nil
+        expect(log.relat2).to be_nil
+        expect(log.age2_known).to be_nil
+        expect(log.age2).to be_nil
+        expect(log.ecstat2).to be_nil
       end
     end
 
@@ -354,10 +354,10 @@ RSpec.describe Form, type: :model do
       let(:log) { FactoryBot.create(:sales_log, :outright_sale_setup_complete, value: 200_000) }
 
       it "the value of this attribute is not cleared" do
-        expect(log.deposit).to be nil
+        expect(log.deposit).to be_nil
         log.update!(mortgageused: 2)
         expect(log.form.questions.any? { |q| q.id == "deposit" && q.page.routed_to?(log, nil) }).to be false
-        expect(log.deposit).not_to be nil
+        expect(log.deposit).not_to be_nil
       end
     end
 
@@ -370,7 +370,7 @@ RSpec.describe Form, type: :model do
         expect(log.form.questions.find { |q| q.id == "location_id" }.answer_options.keys).to be_empty
         log.location_id = location.id
         log.form.reset_not_routed_questions_and_invalid_answers(log)
-        expect(log.location_id).not_to be nil
+        expect(log.location_id).not_to be_nil
       end
     end
   end
@@ -391,7 +391,7 @@ RSpec.describe Form, type: :model do
       expect(form.new_logs_end_date).to eq(Time.zone.parse("2023-11-20"))
       expect(form.edit_end_date).to eq(Time.zone.parse("2023-11-20"))
       expect(form.submission_deadline).to eq(Time.zone.parse("2023-06-09"))
-      expect(form.unresolved_log_redirect_page_id).to eq(nil)
+      expect(form.unresolved_log_redirect_page_id).to be_nil
     end
 
     it "can correctly define sections in the sales form" do
diff --git a/spec/models/forms/bulk_upload_form/upload_your_file_spec.rb b/spec/models/forms/bulk_upload_form/upload_your_file_spec.rb
index dbfc06777..3e3b309af 100644
--- a/spec/models/forms/bulk_upload_form/upload_your_file_spec.rb
+++ b/spec/models/forms/bulk_upload_form/upload_your_file_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Forms::BulkUploadForm::UploadYourFile do
     )
   end
   let(:current_user) { create(:user) }
-  let(:mock_storage_service) { instance_double("S3Service") }
+  let(:mock_storage_service) { instance_double(Storage::S3Service) }
 
   before do
     vcap_services = { "aws-s3-bucket" => {} }
diff --git a/spec/models/forms/bulk_upload_form/year_spec.rb b/spec/models/forms/bulk_upload_form/year_spec.rb
index ac0c443f5..5bee14b4f 100644
--- a/spec/models/forms/bulk_upload_form/year_spec.rb
+++ b/spec/models/forms/bulk_upload_form/year_spec.rb
@@ -8,9 +8,7 @@ RSpec.describe Forms::BulkUploadForm::Year do
 
     describe "#options" do
       before do
-        allow(FormHandler.instance).to receive(:lettings_forms).and_return({ "current_lettings" => instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) })
-        allow(FormHandler.instance).to receive(:previous_lettings_form).and_return(instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))
-        allow(FormHandler.instance).to receive(:next_lettings_form).and_return(instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))
+        allow(FormHandler.instance).to receive_messages(lettings_forms: { "current_lettings" => instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }, previous_lettings_form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)), next_lettings_form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))
       end
 
       context "when in a crossover period" do
@@ -54,9 +52,7 @@ RSpec.describe Forms::BulkUploadForm::Year do
 
     describe "#options" do
       before do
-        allow(FormHandler.instance).to receive(:sales_forms).and_return({ "current_sales" => instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) })
-        allow(FormHandler.instance).to receive(:previous_sales_form).and_return(instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))
-        allow(FormHandler.instance).to receive(:next_sales_form).and_return(instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))
+        allow(FormHandler.instance).to receive_messages(sales_forms: { "current_sales" => instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }, previous_sales_form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)), next_sales_form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))
       end
 
       context "when in a crossover period" do
diff --git a/spec/models/forms/delete_logs_form_spec.rb b/spec/models/forms/delete_logs_form_spec.rb
index 354f00834..a3580be4b 100644
--- a/spec/models/forms/delete_logs_form_spec.rb
+++ b/spec/models/forms/delete_logs_form_spec.rb
@@ -70,10 +70,10 @@ RSpec.describe Forms::DeleteLogsForm do
     create(:lettings_log)
 
     expect(FilterManager).to receive(:filter_logs) { |arg1, arg2, arg3, arg4, arg5|
-      expect(arg1).to contain_exactly(*visible_logs)
+      expect(arg1).to match_array(visible_logs)
       expect(arg2).to eq search_term
       expect(arg3).to eq log_filters
-      expect(arg4).to be nil
+      expect(arg4).to be_nil
       expect(arg5).to be current_user
     }.and_return visible_logs
     delete_logs_form
diff --git a/spec/models/lettings_log_derived_fields_spec.rb b/spec/models/lettings_log_derived_fields_spec.rb
index 9cb6cf7d1..62ddd36ee 100644
--- a/spec/models/lettings_log_derived_fields_spec.rb
+++ b/spec/models/lettings_log_derived_fields_spec.rb
@@ -96,7 +96,7 @@ RSpec.describe LettingsLog, type: :model do
 
       log.set_derived_fields!
 
-      expect(log.vacdays).to be nil
+      expect(log.vacdays).to be_nil
     end
 
     it "does not derive vacdays if startdate is blank" do
@@ -106,7 +106,7 @@ RSpec.describe LettingsLog, type: :model do
 
       log.set_derived_fields!
 
-      expect(log.vacdays).to be nil
+      expect(log.vacdays).to be_nil
     end
   end
 
@@ -983,7 +983,7 @@ RSpec.describe LettingsLog, type: :model do
     it "when any charge field is set all blank charge fields are set to 0, non-blank fields are left the same" do
       log.set_derived_fields!
       %i[brent scharge pscharge supcharg].each do |field|
-        expect(log[field]).to be nil
+        expect(log[field]).to be_nil
       end
 
       brent_val = 111
@@ -1146,14 +1146,14 @@ RSpec.describe LettingsLog, type: :model do
           log.needstype = 2
           log.set_derived_fields!
 
-          expect(log.prevten).to be nil
+          expect(log.prevten).to be_nil
         end
 
         it "clears prevten if renewal is update to no" do
           log.renewal = 0
           log.set_derived_fields!
 
-          expect(log.prevten).to be nil
+          expect(log.prevten).to be_nil
         end
       end
 
@@ -1174,14 +1174,14 @@ RSpec.describe LettingsLog, type: :model do
           log.needstype = 2
           log.set_derived_fields!
 
-          expect(log.prevten).to be nil
+          expect(log.prevten).to be_nil
         end
 
         it "clears prevten if renewal is update to no" do
           log.renewal = 0
           log.set_derived_fields!
 
-          expect(log.prevten).to be nil
+          expect(log.prevten).to be_nil
         end
       end
     end
@@ -1281,7 +1281,7 @@ RSpec.describe LettingsLog, type: :model do
         end
       end
 
-      context "when rent_type is Specified accommodation " do
+      context "when rent_type is Specified accommodation" do
         let(:rent_type) { 6 }
         let(:expected_unitletas) { 9 }
 
diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb
index d115e09fb..543a124fb 100644
--- a/spec/models/lettings_log_spec.rb
+++ b/spec/models/lettings_log_spec.rb
@@ -316,22 +316,22 @@ RSpec.describe LettingsLog do
         })
       end
 
-      def check_property_postcode_fields
+      def expect_property_postcode_fields_to_match_example_postcode
         check_postcode_fields("postcode_full")
       end
 
       it "correctly formats previous postcode" do
         address_lettings_log.update!(postcode_full: "M1 1AE")
-        check_property_postcode_fields
+        expect_property_postcode_fields_to_match_example_postcode
 
         address_lettings_log.update!(postcode_full: "m1 1ae")
-        check_property_postcode_fields
+        expect_property_postcode_fields_to_match_example_postcode
 
         address_lettings_log.update!(postcode_full: "m11Ae")
-        check_property_postcode_fields
+        expect_property_postcode_fields_to_match_example_postcode
 
         address_lettings_log.update!(postcode_full: "m11ae")
-        check_property_postcode_fields
+        expect_property_postcode_fields_to_match_example_postcode
       end
 
       it "correctly infers la" do
@@ -342,21 +342,21 @@ RSpec.describe LettingsLog do
 
       it "errors if the property postcode is emptied" do
         expect { address_lettings_log.update!({ postcode_full: "" }) }
-          .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.postcode")}/)
+          .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.postcode')}/)
       end
 
       it "errors if the property postcode is not valid" do
         expect { address_lettings_log.update!({ postcode_full: "invalid_postcode" }) }
-          .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.postcode")}/)
+          .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.postcode')}/)
       end
 
       it "correctly resets all fields if property postcode not known" do
         address_lettings_log.update!({ postcode_known: 0 })
 
         record_from_db = described_class.find(address_lettings_log.id)
-        expect(record_from_db["postcode_full"]).to eq(nil)
-        expect(address_lettings_log.la).to eq(nil)
-        expect(record_from_db["la"]).to eq(nil)
+        expect(record_from_db["postcode_full"]).to be_nil
+        expect(address_lettings_log.la).to be_nil
+        expect(record_from_db["la"]).to be_nil
       end
 
       it "changes the LA if property postcode changes from not known to known and provided" do
@@ -364,7 +364,7 @@ RSpec.describe LettingsLog do
         address_lettings_log.update!({ la: "E09000033" })
 
         record_from_db = described_class.find(address_lettings_log.id)
-        expect(record_from_db["postcode_full"]).to eq(nil)
+        expect(record_from_db["postcode_full"]).to be_nil
         expect(address_lettings_log.la).to eq("E09000033")
         expect(record_from_db["la"]).to eq("E09000033")
 
@@ -429,6 +429,8 @@ RSpec.describe LettingsLog do
 
         address_lettings_log.update!(ppostcode_full: "m11ae")
         previous_postcode_fields
+
+        expect(address_lettings_log.ppostcode_full).to eq("M1 1AE")
       end
 
       it "correctly infers prevloc" do
@@ -439,21 +441,21 @@ RSpec.describe LettingsLog do
 
       it "errors if the previous postcode is emptied" do
         expect { address_lettings_log.update!({ ppostcode_full: "" }) }
-          .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.postcode")}/)
+          .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.postcode')}/)
       end
 
       it "errors if the previous postcode is not valid" do
         expect { address_lettings_log.update!({ ppostcode_full: "invalid_postcode" }) }
-          .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.postcode")}/)
+          .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.postcode')}/)
       end
 
       it "correctly resets all fields if previous postcode not known" do
         address_lettings_log.update!({ ppcodenk: 1 })
 
         record_from_db = described_class.find(address_lettings_log.id)
-        expect(record_from_db["ppostcode_full"]).to eq(nil)
-        expect(address_lettings_log.prevloc).to eq(nil)
-        expect(record_from_db["prevloc"]).to eq(nil)
+        expect(record_from_db["ppostcode_full"]).to be_nil
+        expect(address_lettings_log.prevloc).to be_nil
+        expect(record_from_db["prevloc"]).to be_nil
       end
 
       it "correctly resets la if la is not known" do
@@ -465,8 +467,8 @@ RSpec.describe LettingsLog do
 
         address_lettings_log.update!({ previous_la_known: 0 })
         record_from_db = described_class.find(address_lettings_log.id)
-        expect(address_lettings_log.prevloc).to eq(nil)
-        expect(record_from_db["prevloc"]).to eq(nil)
+        expect(address_lettings_log.prevloc).to be_nil
+        expect(record_from_db["prevloc"]).to be_nil
       end
 
       it "changes the prevloc if previous postcode changes from not known to known and provided" do
@@ -474,7 +476,7 @@ RSpec.describe LettingsLog do
         address_lettings_log.update!({ previous_la_known: 1, prevloc: "E09000033" })
 
         record_from_db = described_class.find(address_lettings_log.id)
-        expect(record_from_db["ppostcode_full"]).to eq(nil)
+        expect(record_from_db["ppostcode_full"]).to be_nil
         expect(address_lettings_log.prevloc).to eq("E09000033")
         expect(record_from_db["prevloc"]).to eq("E09000033")
 
@@ -883,7 +885,7 @@ RSpec.describe LettingsLog do
 
         lettings_log.update!({ rent_type: 3 })
         record_from_db = described_class.find(lettings_log.id)
-        expect(record_from_db["lar"]).to eq(nil)
+        expect(record_from_db["lar"]).to be_nil
       end
 
       it "derives irproduct as rent_to_buy (1) if rent_type is rent_to_buy (3)" do
@@ -911,7 +913,7 @@ RSpec.describe LettingsLog do
 
         lettings_log.update!({ rent_type: 2 })
         record_from_db = described_class.find(lettings_log.id)
-        expect(record_from_db["irproduct"]).to eq(nil)
+        expect(record_from_db["irproduct"]).to be_nil
       end
     end
 
@@ -962,8 +964,8 @@ RSpec.describe LettingsLog do
         expect(lettings_log.reload.la).to eq("E08000003")
 
         lettings_log.update!(startdate: Time.zone.tomorrow)
-        expect(lettings_log.reload.la).to eq(nil)
-        expect(lettings_log.reload.is_la_inferred).to eq(false)
+        expect(lettings_log.reload.la).to be_nil
+        expect(lettings_log.reload.is_la_inferred).to be(false)
       end
     end
 
@@ -994,17 +996,17 @@ RSpec.describe LettingsLog do
         end
 
         it "keeps the manually entered address" do
-          expect(address_lettings_log.manual_address_entry_selected).to eq(true)
-          expect(address_lettings_log.uprn_selection).to eq(nil)
+          expect(address_lettings_log.manual_address_entry_selected).to be(true)
+          expect(address_lettings_log.uprn_selection).to be_nil
           expect(address_lettings_log.uprn_known).to eq(0)
-          expect(address_lettings_log.uprn).to eq(nil)
+          expect(address_lettings_log.uprn).to be_nil
           expect(address_lettings_log.address_line1).to eq("Address line 1")
           expect(address_lettings_log.address_line2).to eq("Address line 2")
           expect(address_lettings_log.town_or_city).to eq("Town")
           expect(address_lettings_log.postcode_full).to eq("AA1 1AA")
 
           address_lettings_log.update!(rsnvac: 16)
-          expect(address_lettings_log.manual_address_entry_selected).to eq(true)
+          expect(address_lettings_log.manual_address_entry_selected).to be(true)
           expect(address_lettings_log.address_line1).to eq("Address line 1")
           expect(address_lettings_log.address_line2).to eq("Address line 2")
           expect(address_lettings_log.town_or_city).to eq("Town")
@@ -1028,19 +1030,19 @@ RSpec.describe LettingsLog do
         end
 
         it "routes to the uprn question" do
-          expect(address_lettings_log.manual_address_entry_selected).to eq(true)
-          expect(address_lettings_log.uprn_selection).to eq(nil)
+          expect(address_lettings_log.manual_address_entry_selected).to be(true)
+          expect(address_lettings_log.uprn_selection).to be_nil
           expect(address_lettings_log.uprn_known).to eq(0)
-          expect(address_lettings_log.uprn).to eq(nil)
-          expect(address_lettings_log.address_line1).to eq(nil)
-          expect(address_lettings_log.address_line2).to eq(nil)
-          expect(address_lettings_log.town_or_city).to eq(nil)
-          expect(address_lettings_log.postcode_full).to eq(nil)
+          expect(address_lettings_log.uprn).to be_nil
+          expect(address_lettings_log.address_line1).to be_nil
+          expect(address_lettings_log.address_line2).to be_nil
+          expect(address_lettings_log.town_or_city).to be_nil
+          expect(address_lettings_log.postcode_full).to be_nil
 
           address_lettings_log.update!(rsnvac: 16)
-          expect(address_lettings_log.manual_address_entry_selected).to eq(false)
-          expect(address_lettings_log.uprn_selection).to eq(nil)
-          expect(address_lettings_log.uprn_known).to eq(nil)
+          expect(address_lettings_log.manual_address_entry_selected).to be(false)
+          expect(address_lettings_log.uprn_selection).to be_nil
+          expect(address_lettings_log.uprn_known).to be_nil
         end
       end
     end
@@ -1072,14 +1074,14 @@ RSpec.describe LettingsLog do
         end
 
         it "keeps the uprn" do
-          expect(address_lettings_log.manual_address_entry_selected).to eq(false)
+          expect(address_lettings_log.manual_address_entry_selected).to be(false)
           expect(address_lettings_log.uprn).to eq("1")
           expect(address_lettings_log.address_line1).to eq("1, Test Street")
           expect(address_lettings_log.town_or_city).to eq("Test Town")
           expect(address_lettings_log.postcode_full).to eq("AA1 1AA")
 
           address_lettings_log.update!(rsnvac: 15)
-          expect(address_lettings_log.manual_address_entry_selected).to eq(false)
+          expect(address_lettings_log.manual_address_entry_selected).to be(false)
           expect(address_lettings_log.address_line1).to eq("1, Test Street")
           expect(address_lettings_log.town_or_city).to eq("Test Town")
           expect(address_lettings_log.postcode_full).to eq("AA1 1AA")
@@ -1106,14 +1108,14 @@ RSpec.describe LettingsLog do
         end
 
         it "keeps the manually entered address" do
-          expect(address_lettings_log.manual_address_entry_selected).to eq(true)
+          expect(address_lettings_log.manual_address_entry_selected).to be(true)
           expect(address_lettings_log.address_line1).to eq("Address line 1")
           expect(address_lettings_log.address_line2).to eq("Address line 2")
           expect(address_lettings_log.town_or_city).to eq("Town")
           expect(address_lettings_log.postcode_full).to eq("AA1 1AA")
 
           address_lettings_log.update!(rsnvac: 15)
-          expect(address_lettings_log.manual_address_entry_selected).to eq(true)
+          expect(address_lettings_log.manual_address_entry_selected).to be(true)
           expect(address_lettings_log.address_line1).to eq("Address line 1")
           expect(address_lettings_log.address_line2).to eq("Address line 2")
           expect(address_lettings_log.town_or_city).to eq("Town")
@@ -1137,17 +1139,17 @@ RSpec.describe LettingsLog do
         end
 
         it "routes to the manual address questions" do
-          expect(address_lettings_log.manual_address_entry_selected).to eq(false)
-          expect(address_lettings_log.uprn_selection).to eq(nil)
-          expect(address_lettings_log.address_line1).to eq(nil)
-          expect(address_lettings_log.address_line2).to eq(nil)
-          expect(address_lettings_log.town_or_city).to eq(nil)
-          expect(address_lettings_log.postcode_full).to eq(nil)
+          expect(address_lettings_log.manual_address_entry_selected).to be(false)
+          expect(address_lettings_log.uprn_selection).to be_nil
+          expect(address_lettings_log.address_line1).to be_nil
+          expect(address_lettings_log.address_line2).to be_nil
+          expect(address_lettings_log.town_or_city).to be_nil
+          expect(address_lettings_log.postcode_full).to be_nil
 
           address_lettings_log.update!(rsnvac: 15)
-          expect(address_lettings_log.manual_address_entry_selected).to eq(true)
-          expect(address_lettings_log.uprn_selection).to eq(nil)
-          expect(address_lettings_log.uprn).to eq(nil)
+          expect(address_lettings_log.manual_address_entry_selected).to be(true)
+          expect(address_lettings_log.uprn_selection).to be_nil
+          expect(address_lettings_log.uprn).to be_nil
           expect(address_lettings_log.uprn_known).to eq(0)
         end
       end
@@ -1253,7 +1255,7 @@ RSpec.describe LettingsLog do
         lettings_log.update!({ cbl: 1 })
         lettings_log.update!({ preg_occ: 1 })
 
-        expect(lettings_log.cbl).to eq(nil)
+        expect(lettings_log.cbl).to be_nil
       end
     end
 
@@ -1302,8 +1304,8 @@ RSpec.describe LettingsLog do
         it "clears the scheme and location values" do
           lettings_log.update!(owning_organisation: organisation_2)
           lettings_log.reload
-          expect(lettings_log.scheme).to be nil
-          expect(lettings_log.location).to be nil
+          expect(lettings_log.scheme).to be_nil
+          expect(lettings_log.location).to be_nil
         end
       end
 
@@ -1331,12 +1333,12 @@ RSpec.describe LettingsLog do
           lettings_log.update!(startdate: Time.zone.yesterday)
           lettings_log.reload
           expect(lettings_log.startdate).to eq(Time.zone.yesterday)
-          expect(lettings_log.voiddate).to eq(nil)
+          expect(lettings_log.voiddate).to be_nil
         end
 
         it "does not impact other validations" do
           expect { lettings_log.update!(startdate: Time.zone.yesterday, referral: 8, rsnvac: 9) }
-            .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.lettings.property.rsnvac.referral_invalid")}/)
+            .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.lettings.property.rsnvac.referral_invalid')}/)
         end
       end
 
@@ -1345,7 +1347,7 @@ RSpec.describe LettingsLog do
           lettings_log.update!(startdate: Time.zone.yesterday)
           lettings_log.reload
           expect(lettings_log.startdate).to eq(Time.zone.yesterday)
-          expect(lettings_log.mrcdate).to eq(nil)
+          expect(lettings_log.mrcdate).to be_nil
         end
       end
 
@@ -1363,16 +1365,16 @@ RSpec.describe LettingsLog do
           lettings_log.update!(location:, scheme:)
           lettings_log.reload
           expect(lettings_log.location).to eq(location)
-          expect(lettings_log.brent).to eq(nil)
-          expect(lettings_log.scharge).to eq(nil)
-          expect(lettings_log.pscharge).to eq(nil)
-          expect(lettings_log.supcharg).to eq(nil)
-          expect(lettings_log.tcharge).to eq(nil)
+          expect(lettings_log.brent).to be_nil
+          expect(lettings_log.scharge).to be_nil
+          expect(lettings_log.pscharge).to be_nil
+          expect(lettings_log.supcharg).to be_nil
+          expect(lettings_log.tcharge).to be_nil
         end
 
         it "does not impact other validations" do
           expect { lettings_log.update!(startdate: Time.zone.yesterday, referral: 8, rsnvac: 9) }
-            .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.lettings.property.rsnvac.referral_invalid")}/)
+            .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.lettings.property.rsnvac.referral_invalid')}/)
         end
       end
     end
@@ -2190,7 +2192,7 @@ RSpec.describe LettingsLog do
       let(:startdate) { nil }
 
       it "returns false" do
-        expect(log.collection_period_open?).to eq(true)
+        expect(log.collection_period_open?).to be(true)
       end
     end
 
@@ -2203,7 +2205,7 @@ RSpec.describe LettingsLog do
       end
 
       it "returns true" do
-        expect(log.collection_period_open?).to eq(false)
+        expect(log.collection_period_open?).to be(false)
       end
     end
 
@@ -2215,7 +2217,7 @@ RSpec.describe LettingsLog do
       end
 
       it "returns true" do
-        expect(log.collection_period_open?).to eq(true)
+        expect(log.collection_period_open?).to be(true)
       end
     end
 
@@ -2227,7 +2229,7 @@ RSpec.describe LettingsLog do
       end
 
       it "returns false" do
-        expect(log.collection_period_open?).to eq(false)
+        expect(log.collection_period_open?).to be(false)
       end
     end
   end
diff --git a/spec/models/location_deactivation_period_spec.rb b/spec/models/location_deactivation_period_spec.rb
index 709aec749..70df5c4dc 100644
--- a/spec/models/location_deactivation_period_spec.rb
+++ b/spec/models/location_deactivation_period_spec.rb
@@ -9,8 +9,7 @@ RSpec.describe LocationDeactivationPeriod do
 
   describe "#validate" do
     before do
-      allow(FormHandler.instance).to receive(:previous_collection_start_date).and_return(previous_collection_start_date)
-      allow(FormHandler.instance).to receive(:current_collection_start_date).and_return(current_collection_start_date)
+      allow(FormHandler.instance).to receive_messages(previous_collection_start_date: previous_collection_start_date, current_collection_start_date: current_collection_start_date)
     end
 
     context "when not in a crossover period" do
diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb
index df2f2ea9e..9f1b57671 100644
--- a/spec/models/location_spec.rb
+++ b/spec/models/location_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Location, type: :model do
       location.postcode = "M1 1AE"
       location.save!
       expect(location.location_code).to eq("E08000003")
-      expect(location.is_la_inferred).to eq(true)
+      expect(location.is_la_inferred).to be(true)
     end
 
     it "infers and returns the list of local authorities" do
@@ -42,9 +42,9 @@ RSpec.describe Location, type: :model do
 
       it "does not set the local authority" do
         location.update!(postcode: "CA10 1AA", location_code: nil, location_admin_district: nil)
-        expect(location.location_code).to eq(nil)
+        expect(location.location_code).to be_nil
         expect(location.linked_local_authorities.count).to eq(0)
-        expect(location.is_la_inferred).to eq(false)
+        expect(location.is_la_inferred).to be(false)
       end
     end
 
@@ -935,7 +935,7 @@ RSpec.describe Location, type: :model do
     let(:location) { FactoryBot.build(:location, startdate: Time.zone.today - 2.months) }
 
     context "when location is not confirmed" do
-      it "returns incomplete " do
+      it "returns incomplete" do
         location.confirmed = false
         expect(location.status).to eq(:incomplete)
       end
diff --git a/spec/models/organisation_spec.rb b/spec/models/organisation_spec.rb
index 402aa57c7..6d48b6516 100644
--- a/spec/models/organisation_spec.rb
+++ b/spec/models/organisation_spec.rb
@@ -138,7 +138,7 @@ RSpec.describe Organisation, type: :model do
 
       context "when the org does not use all rent periods" do
         it "#rent_periods returns the correct ids" do
-          expect(organisation.rent_periods).to match_array([4, 2, 1])
+          expect(organisation.rent_periods).to contain_exactly(4, 2, 1)
         end
 
         it "#rent_period_labels returns the correct labels in order" do
@@ -162,7 +162,7 @@ RSpec.describe Organisation, type: :model do
         end
 
         it "#rent_periods returns the correct ids" do
-          expect(organisation.rent_periods).to match_array([4, 2, 1, 3])
+          expect(organisation.rent_periods).to contain_exactly(4, 2, 1, 3)
         end
 
         it "#rent_period_labels returns All" do
@@ -207,7 +207,7 @@ RSpec.describe Organisation, type: :model do
       end
 
       it "has lettings logs" do
-        expect(organisation.lettings_logs.to_a).to match_array([owned_lettings_log, managed_lettings_log])
+        expect(organisation.lettings_logs.to_a).to contain_exactly(owned_lettings_log, managed_lettings_log)
       end
     end
   end
diff --git a/spec/models/sales_log_spec.rb b/spec/models/sales_log_spec.rb
index 3205565bd..01a76ab39 100644
--- a/spec/models/sales_log_spec.rb
+++ b/spec/models/sales_log_spec.rb
@@ -536,22 +536,22 @@ RSpec.describe SalesLog, type: :model do
       )
     end
 
-    def check_property_postcode_fields
+    def expect_property_postcode_fields_to_match_example_postcode
       check_postcode_fields("postcode_full")
     end
 
     it "correctly formats previous postcode" do
       address_sales_log.update!(postcode_full: "M1 1AE")
-      check_property_postcode_fields
+      expect_property_postcode_fields_to_match_example_postcode
 
       address_sales_log.update!(postcode_full: "m1 1ae")
-      check_property_postcode_fields
+      expect_property_postcode_fields_to_match_example_postcode
 
       address_sales_log.update!(postcode_full: "m11Ae")
-      check_property_postcode_fields
+      expect_property_postcode_fields_to_match_example_postcode
 
       address_sales_log.update!(postcode_full: "m11ae")
-      check_property_postcode_fields
+      expect_property_postcode_fields_to_match_example_postcode
     end
 
     it "correctly infers la" do
@@ -648,21 +648,21 @@ RSpec.describe SalesLog, type: :model do
 
     it "errors if the property postcode is emptied" do
       expect { address_sales_log.update!({ postcode_full: "" }) }
-        .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.postcode")}/)
+        .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.postcode')}/)
     end
 
     it "errors if the property postcode is not valid" do
       expect { address_sales_log.update!({ postcode_full: "invalid_postcode" }) }
-        .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.postcode")}/)
+        .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.postcode')}/)
     end
 
     it "correctly resets all fields if property postcode not known" do
       address_sales_log.update!({ pcodenk: 1 })
 
       record_from_db = described_class.find(address_sales_log.id)
-      expect(record_from_db["postcode_full"]).to eq(nil)
-      expect(address_sales_log.la).to eq(nil)
-      expect(record_from_db["la"]).to eq(nil)
+      expect(record_from_db["postcode_full"]).to be_nil
+      expect(address_sales_log.la).to be_nil
+      expect(record_from_db["la"]).to be_nil
     end
 
     it "changes the LA if property postcode changes from not known to known and provided" do
@@ -670,7 +670,7 @@ RSpec.describe SalesLog, type: :model do
       address_sales_log.update!({ la: "E09000033" })
 
       record_from_db = described_class.find(address_sales_log.id)
-      expect(record_from_db["postcode_full"]).to eq(nil)
+      expect(record_from_db["postcode_full"]).to be_nil
       expect(address_sales_log.la).to eq("E09000033")
       expect(record_from_db["la"]).to eq("E09000033")
 
@@ -775,6 +775,8 @@ RSpec.describe SalesLog, type: :model do
 
       address_sales_log.update!(ppostcode_full: "m11ae")
       previous_postcode_fields
+
+      expect(address_sales_log.ppostcode_full).to eq("M1 1AE")
     end
 
     it "correctly infers prevloc" do
@@ -785,21 +787,21 @@ RSpec.describe SalesLog, type: :model do
 
     it "errors if the previous postcode is emptied" do
       expect { address_sales_log.update!({ ppostcode_full: "" }) }
-        .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.postcode")}/)
+        .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.postcode')}/)
     end
 
     it "errors if the previous postcode is not valid" do
       expect { address_sales_log.update!({ ppostcode_full: "invalid_postcode" }) }
-        .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.postcode")}/)
+        .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t('validations.postcode')}/)
     end
 
     it "correctly resets all fields if previous postcode not known" do
       address_sales_log.update!({ ppcodenk: 1 })
 
       record_from_db = described_class.find(address_sales_log.id)
-      expect(record_from_db["ppostcode_full"]).to eq(nil)
-      expect(address_sales_log.prevloc).to eq(nil)
-      expect(record_from_db["prevloc"]).to eq(nil)
+      expect(record_from_db["ppostcode_full"]).to be_nil
+      expect(address_sales_log.prevloc).to be_nil
+      expect(record_from_db["prevloc"]).to be_nil
     end
   end
 
@@ -866,7 +868,7 @@ RSpec.describe SalesLog, type: :model do
       let(:saledate) { nil }
 
       it "returns false" do
-        expect(log.collection_period_open?).to eq(true)
+        expect(log.collection_period_open?).to be(true)
       end
     end
 
@@ -879,7 +881,7 @@ RSpec.describe SalesLog, type: :model do
       end
 
       it "returns true" do
-        expect(log.collection_period_open?).to eq(false)
+        expect(log.collection_period_open?).to be(false)
       end
     end
 
@@ -891,7 +893,7 @@ RSpec.describe SalesLog, type: :model do
       end
 
       it "returns true" do
-        expect(log.collection_period_open?).to eq(true)
+        expect(log.collection_period_open?).to be(true)
       end
     end
 
@@ -903,7 +905,7 @@ RSpec.describe SalesLog, type: :model do
       end
 
       it "returns false" do
-        expect(log.collection_period_open?).to eq(false)
+        expect(log.collection_period_open?).to be(false)
       end
     end
   end
@@ -1014,8 +1016,8 @@ RSpec.describe SalesLog, type: :model do
       expect(sales_log.reload.la).to eq("E08000003")
 
       sales_log.update!(saledate: date_after_end_date)
-      expect(sales_log.reload.la).to eq(nil)
-      expect(sales_log.reload.is_la_inferred).to eq(false)
+      expect(sales_log.reload.la).to be_nil
+      expect(sales_log.reload.is_la_inferred).to be(false)
     end
   end
 
diff --git a/spec/models/scheme_deactivation_period_spec.rb b/spec/models/scheme_deactivation_period_spec.rb
index d050f7132..5bbf2c318 100644
--- a/spec/models/scheme_deactivation_period_spec.rb
+++ b/spec/models/scheme_deactivation_period_spec.rb
@@ -7,8 +7,7 @@ RSpec.describe SchemeDeactivationPeriod do
 
   describe "#validate" do
     before do
-      allow(FormHandler.instance).to receive(:previous_collection_start_date).and_return(previous_collection_start_date)
-      allow(FormHandler.instance).to receive(:current_collection_start_date).and_return(current_collection_start_date)
+      allow(FormHandler.instance).to receive_messages(previous_collection_start_date: previous_collection_start_date, current_collection_start_date: current_collection_start_date)
     end
 
     context "when not in a crossover period" do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index b78d67e9c..495d5ba13 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe User, type: :model do
       end
 
       it "has lettings logs through their organisation" do
-        expect(user.lettings_logs.to_a).to match_array([owned_lettings_log, managed_lettings_log])
+        expect(user.lettings_logs.to_a).to contain_exactly(owned_lettings_log, managed_lettings_log)
       end
 
       context "when the user's organisation has absorbed another" do
@@ -76,7 +76,7 @@ RSpec.describe User, type: :model do
         end
 
         it "has lettings logs through both their organisation and absorbed organisation" do
-          expect(user.reload.lettings_logs.to_a).to match_array([owned_lettings_log, managed_lettings_log, absorbed_org_owned_lettings_log, absorbed_org_managed_lettings_log])
+          expect(user.reload.lettings_logs.to_a).to contain_exactly(owned_lettings_log, managed_lettings_log, absorbed_org_owned_lettings_log, absorbed_org_managed_lettings_log)
         end
       end
     end
@@ -203,7 +203,7 @@ RSpec.describe User, type: :model do
       end
 
       it "has access to logs from all organisations" do
-        expect(user.lettings_logs.to_a).to match_array([owned_lettings_log, managed_lettings_log, other_orgs_log])
+        expect(user.lettings_logs.to_a).to contain_exactly(owned_lettings_log, managed_lettings_log, other_orgs_log)
       end
 
       it "requires 2FA" do
@@ -222,7 +222,7 @@ RSpec.describe User, type: :model do
         expect(user.logs_filters).to match_array(%w[years status needstypes salestypes assigned_to user owning_organisation managing_organisation bulk_upload_id managing_organisation_text_search owning_organisation_text_search user_text_search])
       end
 
-      it "can filter bulk uploads by year, uploaded_by and uploading_organisation " do
+      it "can filter bulk uploads by year, uploaded_by and uploading_organisation" do
         expect(user.bulk_uploads_filters).to match_array(%w[user years uploaded_by uploading_organisation user_text_search uploading_organisation_text_search])
       end
 
@@ -247,8 +247,7 @@ RSpec.describe User, type: :model do
       let(:user) { create(:user, :support) }
 
       before do
-        allow(Rails.env).to receive(:development?).and_return(false)
-        allow(Rails.env).to receive(:review?).and_return(true)
+        allow(Rails.env).to receive_messages(development?: false, review?: true)
       end
 
       it "does not require 2FA" do
@@ -566,13 +565,13 @@ RSpec.describe User, type: :model do
       it "owned lettings logs are not deleted as a result" do
         expect { user.destroy! }
           .to change(described_class, :count).by(-1)
-          .and change(LettingsLog, :count).by(0)
+          .and not_change(LettingsLog, :count)
       end
 
       it "owned sales logs are not deleted as a result" do
         expect { user.destroy! }
           .to change(described_class, :count).by(-1)
-          .and change(SalesLog, :count).by(0)
+          .and not_change(SalesLog, :count)
       end
     end
   end
diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb
index 5d2d971e5..8743eeb46 100644
--- a/spec/models/validations/household_validations_spec.rb
+++ b/spec/models/validations/household_validations_spec.rb
@@ -434,7 +434,7 @@ RSpec.describe Validations::HouseholdValidations do
         .to include(match I18n.t("validations.lettings.household.condition_effects.no_choices"))
     end
 
-    it "expects that an illness can be selected if answer to anyone in household with health condition is yes " do
+    it "expects that an illness can be selected if answer to anyone in household with health condition is yes" do
       record.illness = 1
       record.illness_type_1 = 1
       record.illness_type_2 = 1
diff --git a/spec/models/validations/sales/sale_information_validations_spec.rb b/spec/models/validations/sales/sale_information_validations_spec.rb
index 56007b629..1731f19ac 100644
--- a/spec/models/validations/sales/sale_information_validations_spec.rb
+++ b/spec/models/validations/sales/sale_information_validations_spec.rb
@@ -976,7 +976,7 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
 
     let(:saledate) { current_collection_start_date }
 
-    context "when MORTGAGE + DEPOSIT does not equal VALUE * EQUITY/100 " do
+    context "when MORTGAGE + DEPOSIT does not equal VALUE * EQUITY/100" do
       context "and it is not a staircase transaction" do
         before do
           record.staircase = 2
@@ -1076,7 +1076,7 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
         record.mortgageused = 2
       end
 
-      context "when DEPOSIT does not equal VALUE * EQUITY/100 " do
+      context "when DEPOSIT does not equal VALUE * EQUITY/100" do
         context "and it is not a staircase transaction" do
           before do
             record.staircase = 2
diff --git a/spec/models/validations/soft_validations_spec.rb b/spec/models/validations/soft_validations_spec.rb
index 02b383acf..9026b03dc 100644
--- a/spec/models/validations/soft_validations_spec.rb
+++ b/spec/models/validations/soft_validations_spec.rb
@@ -1535,6 +1535,44 @@ RSpec.describe Validations::SoftValidations do
     end
   end
 
+  describe "tenancyother_might_be_introductory_or_starter_period?" do
+    it "returns true if tenancyother is exactly in the 'likely introductory/starter period' list" do
+      record.tenancyother = "introductory"
+
+      expect(record).to be_tenancyother_might_be_introductory_or_starter_period
+    end
+
+    it "returns true if any word of tenancyother is exactly in the 'likely introductory/starter period' list" do
+      record.tenancyother = "a starter tenancy"
+
+      expect(record).to be_tenancyother_might_be_introductory_or_starter_period
+    end
+
+    it "is not case sensitive when matching" do
+      record.tenancyother = "Intro"
+
+      expect(record).to be_tenancyother_might_be_introductory_or_starter_period
+    end
+
+    it "returns false if no part of tenancyother is in the 'likely introductory/starter period' list" do
+      record.tenancyother = "other"
+
+      expect(record).not_to be_tenancyother_might_be_introductory_or_starter_period
+    end
+
+    it "returns false if match to the 'likely introductory/starter period' list is only part of a word" do
+      record.tenancyother = "wasintroductory"
+
+      expect(record).not_to be_tenancyother_might_be_introductory_or_starter_period
+    end
+
+    it "ignores neighbouring non-alphabet for matching" do
+      record.tenancyother = "1starter."
+
+      expect(record).to be_tenancyother_might_be_introductory_or_starter_period
+    end
+  end
+
   describe "at_least_one_working_situation_is_sickness_and_household_sickness_is_no" do
     it "returns true if one person has working situation as illness and household sickness is no" do
       record.illness = 2
diff --git a/spec/presenters/homepage_presenter_spec.rb b/spec/presenters/homepage_presenter_spec.rb
index aa10c8cde..b0cddf6b8 100644
--- a/spec/presenters/homepage_presenter_spec.rb
+++ b/spec/presenters/homepage_presenter_spec.rb
@@ -68,7 +68,7 @@ RSpec.describe HomepagePresenter do
           presenter.last_year_in_progress_sales_data,
           presenter.last_year_completed_sales_data,
         ]
-        expect(sales_data).to all be nil
+        expect(sales_data).to all be_nil
       end
     end
 
@@ -82,7 +82,7 @@ RSpec.describe HomepagePresenter do
           presenter.last_year_in_progress_sales_data,
           presenter.last_year_completed_sales_data,
         ]
-        expect(sales_data).to all be nil
+        expect(sales_data).to all be_nil
       end
     end
   end
@@ -127,7 +127,7 @@ RSpec.describe HomepagePresenter do
           presenter.last_year_in_progress_lettings_data,
           presenter.last_year_in_progress_sales_data,
         ]
-        expect(last_year_in_progress_data).to all be nil
+        expect(last_year_in_progress_data).to all be_nil
       end
     end
   end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c663087d5..35654872e 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -51,7 +51,7 @@ rescue ActiveRecord::PendingMigrationError => e
 end
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_paths = ["#{::Rails.root}/spec/fixtures"]
+  config.fixture_paths = [Rails.root.join("spec/fixtures").to_s]
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
diff --git a/spec/request_helper.rb b/spec/request_helper.rb
index 2e0cc3d70..5b867ecde 100644
--- a/spec/request_helper.rb
+++ b/spec/request_helper.rb
@@ -100,8 +100,8 @@ module RequestHelper
     template = Addressable::Template.new "https://api.os.uk/search/places/v1/find?key=OS_DATA_KEY&maxresults=10&minmatch=0.4&query={+address_query}"
     WebMock.stub_request(:get, template)
       .to_return do |request|
-      address = request.uri.query_values["query"].split(",")
-      { status: 200, body: { results: [{ DPA: { MATCH: 0.9, BUILDING_NAME: "result #{address[0]}", POST_TOWN: "result town or city", POSTCODE: address[1], UPRN: "1" } }] }.to_json, headers: {} }
+        address = request.uri.query_values["query"].split(",")
+        { status: 200, body: { results: [{ DPA: { MATCH: 0.9, BUILDING_NAME: "result #{address[0]}", POST_TOWN: "result town or city", POSTCODE: address[1], UPRN: "1" } }] }.to_json, headers: {} }
     end
   end
 
diff --git a/spec/requests/OrganisationsController/organisations_controller_rent_periods_spec.rb b/spec/requests/OrganisationsController/organisations_controller_rent_periods_spec.rb
index 6ac50f2bb..46cadfb41 100644
--- a/spec/requests/OrganisationsController/organisations_controller_rent_periods_spec.rb
+++ b/spec/requests/OrganisationsController/organisations_controller_rent_periods_spec.rb
@@ -138,7 +138,7 @@ RSpec.describe OrganisationsController, type: :request do
                                    .find(organisation.id)
                                    .organisation_rent_periods
 
-        expect(rent_periods.map(&:rent_period).map(&:to_s)).to match_array([period_to_create, period_to_not_delete])
+        expect(rent_periods.map(&:rent_period).map(&:to_s)).to contain_exactly(period_to_create, period_to_not_delete)
       end
     end
   end
diff --git a/spec/requests/address_search_controller_spec.rb b/spec/requests/address_search_controller_spec.rb
index 1dffdf8cf..a9fff4ace 100644
--- a/spec/requests/address_search_controller_spec.rb
+++ b/spec/requests/address_search_controller_spec.rb
@@ -13,32 +13,32 @@ RSpec.describe AddressSearchController, type: :request do
 
       it "correctly sets address fields" do
         sales_log.reload
-        expect(sales_log.manual_address_entry_selected).to eq(false)
-        expect(sales_log.uprn_known).to eq(nil)
-        expect(sales_log.uprn).to eq(nil)
-        expect(sales_log.uprn_confirmed).to eq(nil)
-        expect(sales_log.uprn_selection).to eq(nil)
-        expect(sales_log.pcodenk).to eq(nil)
-        expect(sales_log.postcode_full).to eq(nil)
-        expect(sales_log.address_line1).to eq(nil)
-        expect(sales_log.address_line2).to eq(nil)
-        expect(sales_log.town_or_city).to eq(nil)
-        expect(sales_log.la).to eq(nil)
+        expect(sales_log.manual_address_entry_selected).to be(false)
+        expect(sales_log.uprn_known).to be_nil
+        expect(sales_log.uprn).to be_nil
+        expect(sales_log.uprn_confirmed).to be_nil
+        expect(sales_log.uprn_selection).to be_nil
+        expect(sales_log.pcodenk).to be_nil
+        expect(sales_log.postcode_full).to be_nil
+        expect(sales_log.address_line1).to be_nil
+        expect(sales_log.address_line2).to be_nil
+        expect(sales_log.town_or_city).to be_nil
+        expect(sales_log.la).to be_nil
 
         get address_manual_input_path(log_type: "sales_log", log_id: sales_log.id)
 
         sales_log.reload
-        expect(sales_log.manual_address_entry_selected).to eq(true)
+        expect(sales_log.manual_address_entry_selected).to be(true)
         expect(sales_log.uprn_known).to eq(0)
-        expect(sales_log.uprn).to eq(nil)
-        expect(sales_log.uprn_confirmed).to eq(nil)
-        expect(sales_log.uprn_selection).to eq(nil)
-        expect(sales_log.pcodenk).to eq(nil)
-        expect(sales_log.postcode_full).to eq(nil)
-        expect(sales_log.address_line1).to eq(nil)
-        expect(sales_log.address_line2).to eq(nil)
-        expect(sales_log.town_or_city).to eq(nil)
-        expect(sales_log.la).to eq(nil)
+        expect(sales_log.uprn).to be_nil
+        expect(sales_log.uprn_confirmed).to be_nil
+        expect(sales_log.uprn_selection).to be_nil
+        expect(sales_log.pcodenk).to be_nil
+        expect(sales_log.postcode_full).to be_nil
+        expect(sales_log.address_line1).to be_nil
+        expect(sales_log.address_line2).to be_nil
+        expect(sales_log.town_or_city).to be_nil
+        expect(sales_log.la).to be_nil
       end
     end
 
@@ -54,24 +54,24 @@ RSpec.describe AddressSearchController, type: :request do
         expect(lettings_log.postcode_known).to eq(1)
         expect(lettings_log.postcode_full).to eq("SW1A 1AA")
         expect(lettings_log.address_line1).to eq("The Mall, City Of Westminster")
-        expect(lettings_log.address_line2).to eq(nil)
+        expect(lettings_log.address_line2).to be_nil
         expect(lettings_log.town_or_city).to eq("London")
         expect(lettings_log.la).to eq("E09000033")
 
         get address_manual_input_path(log_type: "lettings_log", log_id: lettings_log.id)
 
         lettings_log.reload
-        expect(lettings_log.manual_address_entry_selected).to eq(true)
+        expect(lettings_log.manual_address_entry_selected).to be(true)
         expect(lettings_log.uprn_known).to eq(0)
-        expect(lettings_log.uprn).to eq(nil)
-        expect(lettings_log.uprn_confirmed).to eq(nil)
-        expect(lettings_log.uprn_selection).to eq(nil)
-        expect(lettings_log.postcode_known).to eq(nil)
-        expect(lettings_log.postcode_full).to eq(nil)
-        expect(lettings_log.address_line1).to eq(nil)
-        expect(lettings_log.address_line2).to eq(nil)
-        expect(lettings_log.town_or_city).to eq(nil)
-        expect(lettings_log.la).to eq(nil)
+        expect(lettings_log.uprn).to be_nil
+        expect(lettings_log.uprn_confirmed).to be_nil
+        expect(lettings_log.uprn_selection).to be_nil
+        expect(lettings_log.postcode_known).to be_nil
+        expect(lettings_log.postcode_full).to be_nil
+        expect(lettings_log.address_line1).to be_nil
+        expect(lettings_log.address_line2).to be_nil
+        expect(lettings_log.town_or_city).to be_nil
+        expect(lettings_log.la).to be_nil
       end
     end
   end
@@ -82,32 +82,32 @@ RSpec.describe AddressSearchController, type: :request do
 
       it "correctly sets address fields" do
         lettings_log.reload
-        expect(lettings_log.manual_address_entry_selected).to eq(true)
+        expect(lettings_log.manual_address_entry_selected).to be(true)
         expect(lettings_log.uprn_known).to eq(0)
-        expect(lettings_log.uprn).to eq(nil)
-        expect(lettings_log.uprn_confirmed).to eq(nil)
-        expect(lettings_log.uprn_selection).to eq(nil)
-        expect(lettings_log.postcode_known).to eq(nil)
-        expect(lettings_log.postcode_full).to eq(nil)
-        expect(lettings_log.address_line1).to eq(nil)
-        expect(lettings_log.address_line2).to eq(nil)
-        expect(lettings_log.town_or_city).to eq(nil)
-        expect(lettings_log.la).to eq(nil)
+        expect(lettings_log.uprn).to be_nil
+        expect(lettings_log.uprn_confirmed).to be_nil
+        expect(lettings_log.uprn_selection).to be_nil
+        expect(lettings_log.postcode_known).to be_nil
+        expect(lettings_log.postcode_full).to be_nil
+        expect(lettings_log.address_line1).to be_nil
+        expect(lettings_log.address_line2).to be_nil
+        expect(lettings_log.town_or_city).to be_nil
+        expect(lettings_log.la).to be_nil
 
         get address_search_input_path(log_type: "lettings_log", log_id: lettings_log.id)
 
         lettings_log.reload
-        expect(lettings_log.manual_address_entry_selected).to eq(false)
-        expect(lettings_log.uprn_known).to eq(nil)
-        expect(lettings_log.uprn).to eq(nil)
-        expect(lettings_log.uprn_confirmed).to eq(nil)
-        expect(lettings_log.uprn_selection).to eq(nil)
-        expect(lettings_log.postcode_known).to eq(nil)
-        expect(lettings_log.postcode_full).to eq(nil)
-        expect(lettings_log.address_line1).to eq(nil)
-        expect(lettings_log.address_line2).to eq(nil)
-        expect(lettings_log.town_or_city).to eq(nil)
-        expect(lettings_log.la).to eq(nil)
+        expect(lettings_log.manual_address_entry_selected).to be(false)
+        expect(lettings_log.uprn_known).to be_nil
+        expect(lettings_log.uprn).to be_nil
+        expect(lettings_log.uprn_confirmed).to be_nil
+        expect(lettings_log.uprn_selection).to be_nil
+        expect(lettings_log.postcode_known).to be_nil
+        expect(lettings_log.postcode_full).to be_nil
+        expect(lettings_log.address_line1).to be_nil
+        expect(lettings_log.address_line2).to be_nil
+        expect(lettings_log.town_or_city).to be_nil
+        expect(lettings_log.la).to be_nil
       end
     end
 
@@ -116,32 +116,32 @@ RSpec.describe AddressSearchController, type: :request do
 
       it "correctly sets address fields" do
         sales_log.reload
-        expect(sales_log.manual_address_entry_selected).to eq(true)
+        expect(sales_log.manual_address_entry_selected).to be(true)
         expect(sales_log.uprn_known).to eq(0)
-        expect(sales_log.uprn).to eq(nil)
-        expect(sales_log.uprn_confirmed).to eq(nil)
-        expect(sales_log.uprn_selection).to eq(nil)
+        expect(sales_log.uprn).to be_nil
+        expect(sales_log.uprn_confirmed).to be_nil
+        expect(sales_log.uprn_selection).to be_nil
         expect(sales_log.pcodenk).to eq(0)
         expect(sales_log.postcode_full).to eq("SW1A 1AA")
         expect(sales_log.address_line1).to eq("Address line 1")
-        expect(sales_log.address_line2).to eq(nil)
+        expect(sales_log.address_line2).to be_nil
         expect(sales_log.town_or_city).to eq("Test Town")
         expect(sales_log.la).to eq("E09000033")
 
         get address_search_input_path(log_type: "sales_log", log_id: sales_log.id)
 
         sales_log.reload
-        expect(sales_log.manual_address_entry_selected).to eq(false)
-        expect(sales_log.uprn_known).to eq(nil)
-        expect(sales_log.uprn).to eq(nil)
-        expect(sales_log.uprn_confirmed).to eq(nil)
-        expect(sales_log.uprn_selection).to eq(nil)
-        expect(sales_log.pcodenk).to eq(nil)
-        expect(sales_log.postcode_full).to eq(nil)
-        expect(sales_log.address_line1).to eq(nil)
-        expect(sales_log.address_line2).to eq(nil)
-        expect(sales_log.town_or_city).to eq(nil)
-        expect(sales_log.la).to eq(nil)
+        expect(sales_log.manual_address_entry_selected).to be(false)
+        expect(sales_log.uprn_known).to be_nil
+        expect(sales_log.uprn).to be_nil
+        expect(sales_log.uprn_confirmed).to be_nil
+        expect(sales_log.uprn_selection).to be_nil
+        expect(sales_log.pcodenk).to be_nil
+        expect(sales_log.postcode_full).to be_nil
+        expect(sales_log.address_line1).to be_nil
+        expect(sales_log.address_line2).to be_nil
+        expect(sales_log.town_or_city).to be_nil
+        expect(sales_log.la).to be_nil
       end
     end
 
diff --git a/spec/requests/check_errors_controller_spec.rb b/spec/requests/check_errors_controller_spec.rb
index 090fd5e93..017879d89 100644
--- a/spec/requests/check_errors_controller_spec.rb
+++ b/spec/requests/check_errors_controller_spec.rb
@@ -296,7 +296,7 @@ RSpec.describe CheckErrorsController, type: :request do
           expect(page).to have_content("Make sure these answers are correct")
           expect(page).to have_link(lettings_log.form.get_question("hhmemb", lettings_log).check_answer_prompt, href: "/lettings-logs/#{lettings_log.id}/household-members?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state")
           expect(page).to have_link("Enter total number of household members")
-          expect(lettings_log.reload.earnings).to eq(nil)
+          expect(lettings_log.reload.earnings).to be_nil
         end
       end
 
@@ -320,10 +320,10 @@ RSpec.describe CheckErrorsController, type: :request do
         end
 
         it "clears related previous location fields" do
-          expect(lettings_log.reload.prevloc).to eq(nil)
-          expect(lettings_log.reload.previous_la_known).to eq(nil)
-          expect(lettings_log.reload.ppostcode_full).to eq(nil)
-          expect(lettings_log.reload.ppcodenk).to eq(nil)
+          expect(lettings_log.reload.prevloc).to be_nil
+          expect(lettings_log.reload.previous_la_known).to be_nil
+          expect(lettings_log.reload.ppostcode_full).to be_nil
+          expect(lettings_log.reload.ppcodenk).to be_nil
         end
       end
 
@@ -351,7 +351,7 @@ RSpec.describe CheckErrorsController, type: :request do
           expect(page).to have_content("Make sure these answers are correct")
           expect(page).to have_link(sales_log.form.get_question("income1", sales_log).check_answer_prompt, href: "/sales-logs/#{sales_log.id}/buyer-1-income?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state")
           expect(page).to have_link("Enter buyer 1’s gross annual income")
-          expect(sales_log.reload.income1).to eq(nil)
+          expect(sales_log.reload.income1).to be_nil
         end
       end
     end
@@ -442,9 +442,9 @@ RSpec.describe CheckErrorsController, type: :request do
           expect(page).to have_content("Make sure these answers are correct")
           expect(page).to have_link(lettings_log.form.get_question("hhmemb", lettings_log).check_answer_prompt, href: "/lettings-logs/#{lettings_log.id}/household-members?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state")
           expect(page.all(:button, value: "Clear").count).to eq(0)
-          expect(lettings_log.reload.earnings).to eq(nil)
-          expect(lettings_log.reload.incfreq).to eq(nil)
-          expect(lettings_log.reload.hhmemb).to eq(nil)
+          expect(lettings_log.reload.earnings).to be_nil
+          expect(lettings_log.reload.incfreq).to be_nil
+          expect(lettings_log.reload.hhmemb).to be_nil
         end
       end
 
@@ -472,9 +472,9 @@ RSpec.describe CheckErrorsController, type: :request do
           expect(page).to have_content("Make sure these answers are correct")
           expect(page).to have_link(sales_log.form.get_question("income1", sales_log).check_answer_prompt, href: "/sales-logs/#{sales_log.id}/buyer-1-income?referrer=check_answers_new_answer", class: "govuk-link govuk-link--no-visited-state")
           expect(page.all(:button, value: "Clear").count).to eq(0)
-          expect(sales_log.reload.income1).to eq(nil)
-          expect(sales_log.reload.la).to eq(nil)
-          expect(sales_log.reload.ownershipsch).not_to eq(nil)
+          expect(sales_log.reload.income1).to be_nil
+          expect(sales_log.reload.la).to be_nil
+          expect(sales_log.reload.ownershipsch).not_to be_nil
         end
       end
     end
diff --git a/spec/requests/content_controller_spec.rb b/spec/requests/content_controller_spec.rb
index 598b3dfff..28d01b249 100644
--- a/spec/requests/content_controller_spec.rb
+++ b/spec/requests/content_controller_spec.rb
@@ -118,8 +118,7 @@ RSpec.describe ContentController, type: :request do
 
   describe "when both the service_moved? and service_unavailable? feature toggles are on" do
     before do
-      allow(FeatureToggle).to receive(:service_moved?).and_return(true)
-      allow(FeatureToggle).to receive(:service_unavailable?).and_return(true)
+      allow(FeatureToggle).to receive_messages(service_moved?: true, service_unavailable?: true)
     end
 
     describe "render privacy notice content page" do
diff --git a/spec/requests/cookies_controller_spec.rb b/spec/requests/cookies_controller_spec.rb
index b82684b5e..fb6c314c5 100644
--- a/spec/requests/cookies_controller_spec.rb
+++ b/spec/requests/cookies_controller_spec.rb
@@ -62,8 +62,7 @@ RSpec.describe CookiesController, type: :request do
 
   describe "when both the service_moved? and service_unavailable? feature toggles are on" do
     before do
-      allow(FeatureToggle).to receive(:service_moved?).and_return(true)
-      allow(FeatureToggle).to receive(:service_unavailable?).and_return(true)
+      allow(FeatureToggle).to receive_messages(service_moved?: true, service_unavailable?: true)
     end
 
     describe "render cookies page" do
diff --git a/spec/requests/delete_logs_controller_spec.rb b/spec/requests/delete_logs_controller_spec.rb
index b055e9dd1..9d60fef14 100644
--- a/spec/requests/delete_logs_controller_spec.rb
+++ b/spec/requests/delete_logs_controller_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe "DeleteLogs", type: :request do
       table_body_rows = page.find_all("tbody tr")
       expect(table_body_rows.count).to be 2
       ids_in_table = table_body_rows.map { |row| row.first("td").text.strip }
-      expect(ids_in_table).to match_array [log_1.id.to_s, log_2.id.to_s]
+      expect(ids_in_table).to contain_exactly(log_1.id.to_s, log_2.id.to_s)
     end
 
     it "checks all checkboxes by default" do
@@ -89,7 +89,7 @@ RSpec.describe "DeleteLogs", type: :request do
       table_body_rows = page.find_all("tbody tr")
       expect(table_body_rows.count).to be 2
       ids_in_table = table_body_rows.map { |row| row.first("td").text.strip }
-      expect(ids_in_table).to match_array [log_1.id.to_s, log_2.id.to_s]
+      expect(ids_in_table).to contain_exactly(log_1.id.to_s, log_2.id.to_s)
     end
 
     it "only checks the selected checkboxes when selected_ids provided" do
@@ -219,10 +219,10 @@ RSpec.describe "DeleteLogs", type: :request do
         delete delete_logs_lettings_logs_path, params: params
         log_1.reload
         expect(log_1.status).to eq "deleted"
-        expect(log_1.discarded_at).not_to be nil
+        expect(log_1.discarded_at).not_to be_nil
         log_2.reload
         expect(log_2.status).to eq "deleted"
-        expect(log_2.discarded_at).not_to be nil
+        expect(log_2.discarded_at).not_to be_nil
       end
 
       it "redirects to the lettings log index and displays a notice that the logs have been deleted" do
@@ -242,9 +242,9 @@ RSpec.describe "DeleteLogs", type: :request do
         expect(response).to have_http_status(:unauthorized)
         log_1.reload
         expect(log_1.status).to eq "deleted"
-        expect(log_1.discarded_at).not_to be nil
+        expect(log_1.discarded_at).not_to be_nil
         log_2.reload
-        expect(log_2.discarded_at).to be nil
+        expect(log_2.discarded_at).to be_nil
       end
     end
 
@@ -258,17 +258,17 @@ RSpec.describe "DeleteLogs", type: :request do
           delete delete_logs_lettings_logs_path, params: params
           log_1.reload
           expect(log_1.status).to eq "deleted"
-          expect(log_1.discarded_at).not_to be nil
+          expect(log_1.discarded_at).not_to be_nil
           expect(log_1.duplicates.count).to eq(0)
-          expect(log_1.duplicate_set_id).to be nil
+          expect(log_1.duplicate_set_id).to be_nil
           log_2.reload
           expect(log_2.status).to eq "deleted"
-          expect(log_2.discarded_at).not_to be nil
+          expect(log_2.discarded_at).not_to be_nil
           expect(log_2.duplicates.count).to eq(0)
-          expect(log_2.duplicate_set_id).to be nil
+          expect(log_2.duplicate_set_id).to be_nil
           log_3.reload
           expect(log_3.duplicates.count).to eq(0)
-          expect(log_3.duplicate_set_id).to be nil
+          expect(log_3.duplicate_set_id).to be_nil
         end
       end
 
@@ -282,14 +282,14 @@ RSpec.describe "DeleteLogs", type: :request do
           delete delete_logs_lettings_logs_path, params: params
           log_1.reload
           expect(log_1.status).to eq "deleted"
-          expect(log_1.discarded_at).not_to be nil
+          expect(log_1.discarded_at).not_to be_nil
           expect(log_1.duplicates.count).to eq(0)
-          expect(log_1.duplicate_set_id).to be nil
+          expect(log_1.duplicate_set_id).to be_nil
           log_2.reload
           log_3.reload
           expect(log_2.duplicates.count).to eq(1)
           expect(log_3.duplicates.count).to eq(1)
-          expect(log_3.duplicate_set_id).not_to be nil
+          expect(log_3.duplicate_set_id).not_to be_nil
           expect(log_3.duplicate_set_id).to eq(log_2.duplicate_set_id)
         end
       end
@@ -327,7 +327,7 @@ RSpec.describe "DeleteLogs", type: :request do
       table_body_rows = page.find_all("tbody tr")
       expect(table_body_rows.count).to be 2
       ids_in_table = table_body_rows.map { |row| row.first("td").text.strip }
-      expect(ids_in_table).to match_array [log_1.id.to_s, log_2.id.to_s]
+      expect(ids_in_table).to contain_exactly(log_1.id.to_s, log_2.id.to_s)
     end
 
     it "checks all checkboxes by default" do
@@ -376,7 +376,7 @@ RSpec.describe "DeleteLogs", type: :request do
       table_body_rows = page.find_all("tbody tr")
       expect(table_body_rows.count).to be 2
       ids_in_table = table_body_rows.map { |row| row.first("td").text.strip }
-      expect(ids_in_table).to match_array [log_1.id.to_s, log_2.id.to_s]
+      expect(ids_in_table).to contain_exactly(log_1.id.to_s, log_2.id.to_s)
     end
 
     it "only checks the selected checkboxes when selected_ids provided" do
@@ -506,10 +506,10 @@ RSpec.describe "DeleteLogs", type: :request do
         delete delete_logs_sales_logs_path, params: params
         log_1.reload
         expect(log_1.status).to eq "deleted"
-        expect(log_1.discarded_at).not_to be nil
+        expect(log_1.discarded_at).not_to be_nil
         log_2.reload
         expect(log_2.status).to eq "deleted"
-        expect(log_2.discarded_at).not_to be nil
+        expect(log_2.discarded_at).not_to be_nil
       end
 
       it "redirects to the sales log index and displays a notice that the logs have been deleted" do
@@ -529,9 +529,9 @@ RSpec.describe "DeleteLogs", type: :request do
         expect(response).to have_http_status(:unauthorized)
         log_1.reload
         expect(log_1.status).to eq "deleted"
-        expect(log_1.discarded_at).not_to be nil
+        expect(log_1.discarded_at).not_to be_nil
         log_2.reload
-        expect(log_2.discarded_at).to be nil
+        expect(log_2.discarded_at).to be_nil
       end
     end
 
@@ -545,17 +545,17 @@ RSpec.describe "DeleteLogs", type: :request do
           delete delete_logs_sales_logs_path, params: params
           log_1.reload
           expect(log_1.status).to eq "deleted"
-          expect(log_1.discarded_at).not_to be nil
+          expect(log_1.discarded_at).not_to be_nil
           expect(log_1.duplicates.count).to eq(0)
-          expect(log_1.duplicate_set_id).to be nil
+          expect(log_1.duplicate_set_id).to be_nil
           log_2.reload
           expect(log_2.status).to eq "deleted"
-          expect(log_2.discarded_at).not_to be nil
+          expect(log_2.discarded_at).not_to be_nil
           expect(log_2.duplicates.count).to eq(0)
-          expect(log_2.duplicate_set_id).to be nil
+          expect(log_2.duplicate_set_id).to be_nil
           log_3.reload
           expect(log_3.duplicates.count).to eq(0)
-          expect(log_3.duplicate_set_id).to be nil
+          expect(log_3.duplicate_set_id).to be_nil
         end
       end
 
@@ -569,14 +569,14 @@ RSpec.describe "DeleteLogs", type: :request do
           delete delete_logs_sales_logs_path, params: params
           log_1.reload
           expect(log_1.status).to eq "deleted"
-          expect(log_1.discarded_at).not_to be nil
+          expect(log_1.discarded_at).not_to be_nil
           expect(log_1.duplicates.count).to eq(0)
-          expect(log_1.duplicate_set_id).to be nil
+          expect(log_1.duplicate_set_id).to be_nil
           log_2.reload
           log_3.reload
           expect(log_2.duplicates.count).to eq(1)
           expect(log_3.duplicates.count).to eq(1)
-          expect(log_3.duplicate_set_id).not_to be nil
+          expect(log_3.duplicate_set_id).not_to be_nil
           expect(log_3.duplicate_set_id).to eq(log_2.duplicate_set_id)
         end
       end
@@ -618,7 +618,7 @@ RSpec.describe "DeleteLogs", type: :request do
         table_body_rows = page.find_all("tbody tr")
         expect(table_body_rows.count).to be 2
         ids_in_table = table_body_rows.map { |row| row.first("td").text.strip }
-        expect(ids_in_table).to match_array [log_1.id.to_s, log_2.id.to_s]
+        expect(ids_in_table).to contain_exactly(log_1.id.to_s, log_2.id.to_s)
       end
 
       it "checks all checkboxes by default" do
@@ -667,7 +667,7 @@ RSpec.describe "DeleteLogs", type: :request do
         table_body_rows = page.find_all("tbody tr")
         expect(table_body_rows.count).to be 2
         ids_in_table = table_body_rows.map { |row| row.first("td").text.strip }
-        expect(ids_in_table).to match_array [log_1.id.to_s, log_2.id.to_s]
+        expect(ids_in_table).to contain_exactly(log_1.id.to_s, log_2.id.to_s)
       end
 
       it "only checks the selected checkboxes when selected_ids provided" do
@@ -798,10 +798,10 @@ RSpec.describe "DeleteLogs", type: :request do
       it "deletes the logs provided" do
         log_1.reload
         expect(log_1.status).to eq "deleted"
-        expect(log_1.discarded_at).not_to be nil
+        expect(log_1.discarded_at).not_to be_nil
         log_2.reload
         expect(log_2.status).to eq "deleted"
-        expect(log_2.discarded_at).not_to be nil
+        expect(log_2.discarded_at).not_to be_nil
       end
 
       it "redirects to the lettings log index for that organisation and displays a notice that the logs have been deleted" do
@@ -843,7 +843,7 @@ RSpec.describe "DeleteLogs", type: :request do
         table_body_rows = page.find_all("tbody tr")
         expect(table_body_rows.count).to be 2
         ids_in_table = table_body_rows.map { |row| row.first("td").text.strip }
-        expect(ids_in_table).to match_array [log_1.id.to_s, log_2.id.to_s]
+        expect(ids_in_table).to contain_exactly(log_1.id.to_s, log_2.id.to_s)
       end
 
       it "checks all checkboxes by default" do
@@ -892,7 +892,7 @@ RSpec.describe "DeleteLogs", type: :request do
         table_body_rows = page.find_all("tbody tr")
         expect(table_body_rows.count).to be 2
         ids_in_table = table_body_rows.map { |row| row.first("td").text.strip }
-        expect(ids_in_table).to match_array [log_1.id.to_s, log_2.id.to_s]
+        expect(ids_in_table).to contain_exactly(log_1.id.to_s, log_2.id.to_s)
       end
 
       it "only checks the selected checkboxes when selected_ids provided" do
@@ -1023,10 +1023,10 @@ RSpec.describe "DeleteLogs", type: :request do
       it "deletes the logs provided" do
         log_1.reload
         expect(log_1.status).to eq "deleted"
-        expect(log_1.discarded_at).not_to be nil
+        expect(log_1.discarded_at).not_to be_nil
         log_2.reload
         expect(log_2.status).to eq "deleted"
-        expect(log_2.discarded_at).not_to be nil
+        expect(log_2.discarded_at).not_to be_nil
       end
 
       it "redirects to the sales log index for that organisation and displays a notice that the logs have been deleted" do
diff --git a/spec/requests/duplicate_logs_controller_spec.rb b/spec/requests/duplicate_logs_controller_spec.rb
index bc4a059e6..b254dcb15 100644
--- a/spec/requests/duplicate_logs_controller_spec.rb
+++ b/spec/requests/duplicate_logs_controller_spec.rb
@@ -713,8 +713,7 @@ RSpec.describe DuplicateLogsController, type: :request do
 
       before do
         allow(Organisation).to receive(:find).with(user.organisation_id.to_s).and_return(user.organisation)
-        allow(user.organisation).to receive(:editable_duplicate_lettings_logs_sets).and_return([[1, 2], [3, 4, 5]])
-        allow(user.organisation).to receive(:editable_duplicate_sales_logs_sets).and_return([[11, 12]])
+        allow(user.organisation).to receive_messages(editable_duplicate_lettings_logs_sets: [[1, 2], [3, 4, 5]], editable_duplicate_sales_logs_sets: [[11, 12]])
       end
 
       it "gets organisation duplicates" do
@@ -755,8 +754,7 @@ RSpec.describe DuplicateLogsController, type: :request do
         context "when there are no duplicate logs" do
           before do
             allow(Organisation).to receive(:find).with(user.organisation_id.to_s).and_return(user.organisation)
-            allow(user.organisation).to receive(:editable_duplicate_lettings_logs_sets).and_return([])
-            allow(user.organisation).to receive(:editable_duplicate_sales_logs_sets).and_return([])
+            allow(user.organisation).to receive_messages(editable_duplicate_lettings_logs_sets: [], editable_duplicate_sales_logs_sets: [])
             get organisation_duplicates_path(organisation_id: user.organisation_id)
           end
 
@@ -776,8 +774,7 @@ RSpec.describe DuplicateLogsController, type: :request do
       let(:user) { create(:user, :data_coordinator) }
 
       before do
-        allow(user.organisation).to receive(:editable_duplicate_lettings_logs_sets).and_return([[1, 2], [3, 4, 5]])
-        allow(user.organisation).to receive(:editable_duplicate_sales_logs_sets).and_return([[11, 12]])
+        allow(user.organisation).to receive_messages(editable_duplicate_lettings_logs_sets: [[1, 2], [3, 4, 5]], editable_duplicate_sales_logs_sets: [[11, 12]])
       end
 
       it "gets organisation duplicates" do
@@ -791,8 +788,7 @@ RSpec.describe DuplicateLogsController, type: :request do
       let(:user) { create(:user) }
 
       before do
-        allow(user).to receive(:editable_duplicate_lettings_logs_sets).and_return([[1, 2], [3, 4, 5]])
-        allow(user).to receive(:editable_duplicate_sales_logs_sets).and_return([[11, 12]])
+        allow(user).to receive_messages(editable_duplicate_lettings_logs_sets: [[1, 2], [3, 4, 5]], editable_duplicate_sales_logs_sets: [[11, 12]])
       end
 
       it "calls the helper method to retrieve duplicates for the current user" do
@@ -832,8 +828,7 @@ RSpec.describe DuplicateLogsController, type: :request do
 
         context "when there are no duplicate logs" do
           before do
-            allow(user).to receive(:editable_duplicate_lettings_logs_sets).and_return([])
-            allow(user).to receive(:editable_duplicate_sales_logs_sets).and_return([])
+            allow(user).to receive_messages(editable_duplicate_lettings_logs_sets: [], editable_duplicate_sales_logs_sets: [])
             get duplicate_logs_path
           end
 
diff --git a/spec/requests/form_controller_spec.rb b/spec/requests/form_controller_spec.rb
index c5c158a92..27781d59e 100644
--- a/spec/requests/form_controller_spec.rb
+++ b/spec/requests/form_controller_spec.rb
@@ -31,10 +31,8 @@ RSpec.describe FormController, type: :request do
   let(:fake_2021_2022_form) { Form.new("spec/fixtures/forms/2021_2022.json") }
 
   before do
-    allow(fake_2021_2022_form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
-    allow(fake_2021_2022_form).to receive(:edit_end_date).and_return(Time.zone.today + 2.months)
-    allow(FormHandler.instance).to receive(:current_lettings_form).and_return(fake_2021_2022_form)
-    allow(FormHandler.instance).to receive(:lettings_in_crossover_period?).and_return(true)
+    allow(fake_2021_2022_form).to receive_messages(new_logs_end_date: Time.zone.today + 1.day, edit_end_date: Time.zone.today + 2.months)
+    allow(FormHandler.instance).to receive_messages(current_lettings_form: fake_2021_2022_form, lettings_in_crossover_period?: true)
   end
 
   context "when a user is not signed in" do
@@ -108,7 +106,7 @@ RSpec.describe FormController, type: :request do
         expect(response).to redirect_to("/lettings-logs/#{lettings_log.id}/assigned-to")
         follow_redirect!
         lettings_log.reload
-        expect(lettings_log.assigned_to).to eq(nil)
+        expect(lettings_log.assigned_to).to be_nil
       end
     end
 
@@ -842,7 +840,7 @@ RSpec.describe FormController, type: :request do
             it "only updates answers that apply to the page being submitted" do
               lettings_log.reload
               expect(lettings_log.age1).to eq(answer)
-              expect(lettings_log.age2).to be nil
+              expect(lettings_log.age2).to be_nil
             end
 
             it "tracks who updated the record" do
@@ -1724,8 +1722,7 @@ RSpec.describe FormController, type: :request do
           before do
             completed_lettings_log.update!(ecstat1: 1, earnings: 130, hhmemb: 1, benefits: 4) # we're not routing to that page, so it gets cleared?
             allow(completed_lettings_log).to receive(:net_income_soft_validation_triggered?).and_return(true)
-            allow(completed_lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
-            allow(completed_lettings_log.form).to receive(:edit_end_date).and_return(Time.zone.today + 2.months)
+            allow(completed_lettings_log.form).to receive_messages(new_logs_end_date: Time.zone.today + 1.day, edit_end_date: Time.zone.today + 2.months)
             post "/lettings-logs/#{completed_lettings_log.id}/net-income-value-check", params: interrupt_params, headers: headers.merge({ "HTTP_REFERER" => referrer })
           end
 
diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb
index a3dc1396f..4fa319cff 100644
--- a/spec/requests/lettings_logs_controller_spec.rb
+++ b/spec/requests/lettings_logs_controller_spec.rb
@@ -83,7 +83,7 @@ RSpec.describe LettingsLogsController, type: :request do
         it "validates lettings log parameters" do
           json_response = JSON.parse(response.body)
           expect(response).to have_http_status(:unprocessable_content)
-          expect(json_response["errors"]).to match_array([["age1", [I18n.t("validations.shared.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120)]]])
+          expect(json_response["errors"]).to contain_exactly(["age1", [I18n.t("validations.shared.numeric.within_range", field: "Lead tenant’s age", min: 16, max: 120)]])
         end
       end
 
@@ -151,8 +151,8 @@ RSpec.describe LettingsLogsController, type: :request do
           it "sets the managing org and stock-owning org as nil" do
             created_id = response.location.match(/[0-9]+/)[0]
             lettings_log = LettingsLog.find_by(id: created_id)
-            expect(lettings_log.owning_organisation).to eq(nil)
-            expect(lettings_log.managing_organisation).to eq(nil)
+            expect(lettings_log.owning_organisation).to be_nil
+            expect(lettings_log.managing_organisation).to be_nil
           end
 
           it "sets created_by to current user" do
@@ -200,7 +200,7 @@ RSpec.describe LettingsLogsController, type: :request do
             it "sets the managing org as the user's org but the stock-owning org as nil" do
               created_id = response.location.match(/[0-9]+/)[0]
               lettings_log = LettingsLog.find_by(id: created_id)
-              expect(lettings_log.owning_organisation).to eq(nil)
+              expect(lettings_log.owning_organisation).to be_nil
               expect(lettings_log.managing_organisation.name).to eq("User org")
             end
           end
@@ -249,8 +249,8 @@ RSpec.describe LettingsLogsController, type: :request do
 
         it "does not have a button for creating sales logs" do
           get lettings_logs_path, headers:, params: {}
-          page.assert_selector(".govuk-button", text: "Create a new sales log", count: 0)
-          page.assert_selector(".govuk-button", text: "Create a new lettings log", count: 1)
+          expect(page).to have_selector(".govuk-button", text: "Create a new lettings log", count: 1)
+          expect(page).not_to have_selector(".govuk-button", text: "Create a new sales log")
         end
 
         context "and the state of filters and search is such that display_delete_logs returns true" do
@@ -1258,7 +1258,7 @@ RSpec.describe LettingsLogsController, type: :request do
 
             it "marks the log as resolved" do
               lettings_log.reload
-              expect(lettings_log.unresolved).to eq(false)
+              expect(lettings_log.unresolved).to be(false)
             end
 
             it "displays a success banner" do
diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb
index cf8959510..25b08dd40 100644
--- a/spec/requests/locations_controller_spec.rb
+++ b/spec/requests/locations_controller_spec.rb
@@ -610,7 +610,7 @@ RSpec.describe LocationsController, type: :request do
           patch "/schemes/#{scheme.id}/locations/#{location.id}/local-authority", params:
         end
 
-        it "adds local authority to location " do
+        it "adds local authority to location" do
           expect(Location.last.location_admin_district).to eq("Adur")
           expect(Location.last.location_code).to eq("E07000223")
         end
@@ -655,7 +655,7 @@ RSpec.describe LocationsController, type: :request do
           patch "/schemes/#{scheme.id}/locations/#{location.id}/local-authority", params:
         end
 
-        it "adds local authority to location " do
+        it "adds local authority to location" do
           expect(Location.last.location_admin_district).to eq("Adur")
           expect(Location.last.location_code).to eq("E07000223")
         end
@@ -1174,7 +1174,7 @@ RSpec.describe LocationsController, type: :request do
           patch "/schemes/#{scheme.id}/locations/#{location.id}/availability", params:
         end
 
-        it "adds startdate correctly " do
+        it "adds startdate correctly" do
           expect(Location.last.startdate).to eq(Time.zone.local(2022, 1, 2))
         end
 
@@ -1248,7 +1248,7 @@ RSpec.describe LocationsController, type: :request do
           patch "/schemes/#{scheme.id}/locations/#{location.id}/availability", params:
         end
 
-        it "adds startdate correctly " do
+        it "adds startdate correctly" do
           expect(Location.last.startdate).to eq(Time.zone.local(2022, 1, 2))
         end
 
@@ -1328,7 +1328,7 @@ RSpec.describe LocationsController, type: :request do
 
         context "when location is complete" do
           it "confirms location" do
-            expect(Location.last.confirmed).to eq(true)
+            expect(Location.last.confirmed).to be(true)
           end
 
           it "redirects correctly and displays success banner" do
@@ -1342,7 +1342,7 @@ RSpec.describe LocationsController, type: :request do
           let(:location) { create(:location, scheme:, startdate: Time.zone.local(2000, 1, 1), postcode: nil) }
 
           it "does not confirm location" do
-            expect(Location.last.confirmed).to eq(false)
+            expect(Location.last.confirmed).to be(false)
           end
 
           it "redirects correctly and does not display success banner" do
@@ -1362,7 +1362,7 @@ RSpec.describe LocationsController, type: :request do
           it "does not display local authority row" do
             location.reload
             follow_redirect!
-            expect(location.is_la_inferred).to eq(true)
+            expect(location.is_la_inferred).to be(true)
             expect(location.location_admin_district).to eq("Westminster")
             expect(page).not_to have_content("Local authority")
             expect(page).to have_content("Westminster")
@@ -1379,7 +1379,7 @@ RSpec.describe LocationsController, type: :request do
           it "displays local authority row" do
             location.reload
             get "/schemes/#{scheme.id}/locations/#{location.id}/check-answers"
-            expect(location.is_la_inferred).to eq(false)
+            expect(location.is_la_inferred).to be(false)
             expect(page).to have_content("Local authority")
           end
         end
@@ -1438,7 +1438,7 @@ RSpec.describe LocationsController, type: :request do
 
         context "when location is complete" do
           it "confirms location" do
-            expect(Location.last.confirmed).to eq(true)
+            expect(Location.last.confirmed).to be(true)
           end
 
           it "redirects correctly and displays success banner" do
@@ -1452,7 +1452,7 @@ RSpec.describe LocationsController, type: :request do
           let(:location) { create(:location, scheme:, startdate: Time.zone.local(2000, 1, 1), postcode: nil) }
 
           it "does not confirm location" do
-            expect(Location.last.confirmed).to eq(false)
+            expect(Location.last.confirmed).to be(false)
           end
 
           it "redirects correctly and does not display success banner" do
@@ -1611,14 +1611,14 @@ RSpec.describe LocationsController, type: :request do
             expect(lettings_log.location).to eq(location)
             expect(lettings_log.scheme).to eq(scheme)
             lettings_log.reload
-            expect(lettings_log.location).to eq(nil)
-            expect(lettings_log.scheme).to eq(nil)
+            expect(lettings_log.location).to be_nil
+            expect(lettings_log.scheme).to be_nil
           end
 
           it "marks log as needing attention" do
-            expect(lettings_log.unresolved).to eq(nil)
+            expect(lettings_log.unresolved).to be_nil
             lettings_log.reload
-            expect(lettings_log.unresolved).to eq(true)
+            expect(lettings_log.unresolved).to be(true)
           end
 
           it "sends deactivation emails" do
@@ -1660,9 +1660,9 @@ RSpec.describe LocationsController, type: :request do
           end
 
           it "does not mark log as needing attention" do
-            expect(lettings_log.unresolved).to eq(nil)
+            expect(lettings_log.unresolved).to be_nil
             lettings_log.reload
-            expect(lettings_log.unresolved).to eq(nil)
+            expect(lettings_log.unresolved).to be_nil
           end
         end
 
@@ -1686,14 +1686,14 @@ RSpec.describe LocationsController, type: :request do
             expect(lettings_log.location).to eq(location)
             expect(lettings_log.scheme).to eq(scheme)
             lettings_log.reload
-            expect(lettings_log.location).to eq(nil)
-            expect(lettings_log.scheme).to eq(nil)
+            expect(lettings_log.location).to be_nil
+            expect(lettings_log.scheme).to be_nil
           end
 
           it "marks log as needing attention" do
-            expect(lettings_log.unresolved).to eq(nil)
+            expect(lettings_log.unresolved).to be_nil
             lettings_log.reload
-            expect(lettings_log.unresolved).to eq(true)
+            expect(lettings_log.unresolved).to be(true)
           end
         end
       end
@@ -2322,7 +2322,7 @@ RSpec.describe LocationsController, type: :request do
         it "deletes the location" do
           location.reload
           expect(location.status).to eq(:deleted)
-          expect(location.discarded_at).not_to be nil
+          expect(location.discarded_at).not_to be_nil
         end
 
         it "redirects to the scheme locations list and displays a notice that the location has been deleted" do
diff --git a/spec/requests/maintenance_controller_spec.rb b/spec/requests/maintenance_controller_spec.rb
index 28287dbc0..e3d32bbc0 100644
--- a/spec/requests/maintenance_controller_spec.rb
+++ b/spec/requests/maintenance_controller_spec.rb
@@ -89,8 +89,7 @@ RSpec.describe MaintenanceController, type: :request do
 
   describe "when both the service_moved? and service_unavailable? feature toggles are on" do
     before do
-      allow(FeatureToggle).to receive(:service_moved?).and_return(true)
-      allow(FeatureToggle).to receive(:service_unavailable?).and_return(true)
+      allow(FeatureToggle).to receive_messages(service_moved?: true, service_unavailable?: true)
     end
 
     context "when a user visits a page other than the service moved page" do
diff --git a/spec/requests/merge_requests_controller_spec.rb b/spec/requests/merge_requests_controller_spec.rb
index c6ddea466..b96317b39 100644
--- a/spec/requests/merge_requests_controller_spec.rb
+++ b/spec/requests/merge_requests_controller_spec.rb
@@ -531,8 +531,8 @@ RSpec.describe MergeRequestsController, type: :request do
 
           it "updates has_helpdesk_ticket and clears helpdesk_ticket" do
             request
-            expect(merge_request.reload.has_helpdesk_ticket).to eq(false)
-            expect(merge_request.helpdesk_ticket).to eq(nil)
+            expect(merge_request.reload.has_helpdesk_ticket).to be(false)
+            expect(merge_request.helpdesk_ticket).to be_nil
           end
         end
 
@@ -547,7 +547,7 @@ RSpec.describe MergeRequestsController, type: :request do
 
           it "updates has_helpdesk_ticket and clears helpdesk_ticket" do
             request
-            expect(merge_request.reload.has_helpdesk_ticket).to eq(true)
+            expect(merge_request.reload.has_helpdesk_ticket).to be(true)
             expect(merge_request.helpdesk_ticket).to eq("321")
           end
         end
diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb
index f9254b048..35be9454b 100644
--- a/spec/requests/organisations_controller_spec.rb
+++ b/spec/requests/organisations_controller_spec.rb
@@ -919,7 +919,7 @@ RSpec.describe OrganisationsController, type: :request do
           get "/organisations/search", headers:, params: { query: "test organisation" }
           result = JSON.parse(response.body)
           expect(result.count).to eq(3)
-          expect(result.keys).to match_array([user.organisation.id.to_s, parent_organisation.id.to_s, child_organisation.id.to_s])
+          expect(result.keys).to contain_exactly(user.organisation.id.to_s, parent_organisation.id.to_s, child_organisation.id.to_s)
         end
       end
     end
@@ -1822,8 +1822,8 @@ RSpec.describe OrganisationsController, type: :request do
 
           it "deactivates associated users" do
             user_to_update.reload
-            expect(user_to_update.active).to eq(false)
-            expect(user_to_update.reactivate_with_organisation).to eq(true)
+            expect(user_to_update.active).to be(false)
+            expect(user_to_update.reactivate_with_organisation).to be(true)
           end
         end
 
@@ -1857,9 +1857,9 @@ RSpec.describe OrganisationsController, type: :request do
           it "reactivates users deactivated with organisation" do
             user_to_reactivate.reload
             user_not_to_reactivate.reload
-            expect(user_to_reactivate.active).to eq(true)
-            expect(user_to_reactivate.reactivate_with_organisation).to eq(false)
-            expect(user_not_to_reactivate.active).to eq(false)
+            expect(user_to_reactivate.active).to be(true)
+            expect(user_to_reactivate.reactivate_with_organisation).to be(false)
+            expect(user_not_to_reactivate.active).to be(false)
           end
 
           it "sends invitation emails" do
@@ -2008,13 +2008,13 @@ RSpec.describe OrganisationsController, type: :request do
         it "deletes the organisation and related resources" do
           organisation.reload
           expect(organisation.status).to eq(:deleted)
-          expect(organisation.discarded_at).not_to be nil
+          expect(organisation.discarded_at).not_to be_nil
           expect(location.reload.status).to eq(:deleted)
-          expect(location.discarded_at).not_to be nil
+          expect(location.discarded_at).not_to be_nil
           expect(scheme.reload.status).to eq(:deleted)
-          expect(scheme.discarded_at).not_to be nil
+          expect(scheme.discarded_at).not_to be_nil
           expect(org_user.reload.status).to eq(:deleted)
-          expect(org_user.discarded_at).not_to be nil
+          expect(org_user.discarded_at).not_to be_nil
         end
 
         it "redirects to the organisations list and displays a notice that the organisation has been deleted" do
@@ -2059,7 +2059,7 @@ RSpec.describe OrganisationsController, type: :request do
             get lettings_logs_organisation_path(organisation)
           end
 
-          it "does not show the delete logs button " do
+          it "does not show the delete logs button" do
             expect(page).not_to have_link "Delete logs"
           end
 
@@ -2294,7 +2294,7 @@ RSpec.describe OrganisationsController, type: :request do
           get "/organisations/search", headers:, params: { query: "test organisation" }
           result = JSON.parse(response.body)
           expect(result.count).to eq(4)
-          expect(result.keys).to match_array([user.organisation.id.to_s, parent_organisation.id.to_s, child_organisation.id.to_s, other_organisation.id.to_s])
+          expect(result.keys).to contain_exactly(user.organisation.id.to_s, parent_organisation.id.to_s, child_organisation.id.to_s, other_organisation.id.to_s)
         end
       end
     end
diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb
index 9987e1f86..9a6603865 100644
--- a/spec/requests/sales_logs_controller_spec.rb
+++ b/spec/requests/sales_logs_controller_spec.rb
@@ -93,7 +93,7 @@ RSpec.describe SalesLogsController, type: :request do
         it "validates sales log parameters" do
           json_response = JSON.parse(response.body)
           expect(response).to have_http_status(:unprocessable_content)
-          expect(json_response["errors"]).to match_array([["beds", ["Number of bedrooms must be 1 if the property is a bedsit."]], ["proptype", ["Answer cannot be 'Bedsit' if the property has 2 or more bedrooms."]]])
+          expect(json_response["errors"]).to contain_exactly(["beds", ["Number of bedrooms must be 1 if the property is a bedsit."]], ["proptype", ["Answer cannot be 'Bedsit' if the property has 2 or more bedrooms."]])
         end
       end
     end
@@ -129,7 +129,7 @@ RSpec.describe SalesLogsController, type: :request do
           it "sets the stock-owning org as nil" do
             created_id = response.location.match(/[0-9]+/)[0]
             sales_log = SalesLog.find_by(id: created_id)
-            expect(sales_log.owning_organisation).to eq(nil)
+            expect(sales_log.owning_organisation).to be_nil
           end
         end
 
@@ -844,8 +844,8 @@ RSpec.describe SalesLogsController, type: :request do
 
       it "does not have a button for creating lettings logs" do
         get "/sales-logs", headers:, params: {}
-        page.assert_selector(".govuk-button", text: "Create a new sales log", count: 1)
-        page.assert_selector(".govuk-button", text: "Create a new lettings log", count: 0)
+        expect(page).to have_selector(".govuk-button", text: "Create a new sales log", count: 1)
+        expect(page).not_to have_selector(".govuk-button", text: "Create a new lettings log")
       end
     end
 
diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb
index 5da12a36c..2db62e349 100644
--- a/spec/requests/schemes_controller_spec.rb
+++ b/spec/requests/schemes_controller_spec.rb
@@ -395,7 +395,7 @@ RSpec.describe SchemesController, type: :request do
           end
         end
 
-        xcontext "when on the second page" do
+        context "when on the second page" do
           before do
             get "/schemes?page=2"
           end
@@ -1003,12 +1003,12 @@ RSpec.describe SchemesController, type: :request do
           expect(Scheme.last.scheme_type).to eq("Foyer")
           expect(Scheme.last.sensitive).to eq("Yes")
           expect(Scheme.last.registered_under_care_act).to eq("No")
-          expect(Scheme.last.id).not_to eq(nil)
-          expect(Scheme.last.has_other_client_group).to eq(nil)
-          expect(Scheme.last.primary_client_group).to eq(nil)
-          expect(Scheme.last.secondary_client_group).to eq(nil)
-          expect(Scheme.last.support_type).to eq(nil)
-          expect(Scheme.last.intended_stay).to eq(nil)
+          expect(Scheme.last.id).not_to be_nil
+          expect(Scheme.last.has_other_client_group).to be_nil
+          expect(Scheme.last.primary_client_group).to be_nil
+          expect(Scheme.last.secondary_client_group).to be_nil
+          expect(Scheme.last.support_type).to be_nil
+          expect(Scheme.last.intended_stay).to be_nil
           expect(Scheme.last.id_to_display).to match(/S*/)
         end
 
@@ -1037,12 +1037,12 @@ RSpec.describe SchemesController, type: :request do
             expect(Scheme.last.scheme_type).to eq("Foyer")
             expect(Scheme.last.sensitive).to eq("Yes")
             expect(Scheme.last.registered_under_care_act).to eq("No")
-            expect(Scheme.last.id).not_to eq(nil)
-            expect(Scheme.last.has_other_client_group).to eq(nil)
-            expect(Scheme.last.primary_client_group).to eq(nil)
-            expect(Scheme.last.secondary_client_group).to eq(nil)
-            expect(Scheme.last.support_type).to eq(nil)
-            expect(Scheme.last.intended_stay).to eq(nil)
+            expect(Scheme.last.id).not_to be_nil
+            expect(Scheme.last.has_other_client_group).to be_nil
+            expect(Scheme.last.primary_client_group).to be_nil
+            expect(Scheme.last.secondary_client_group).to be_nil
+            expect(Scheme.last.support_type).to be_nil
+            expect(Scheme.last.intended_stay).to be_nil
             expect(Scheme.last.id_to_display).to match(/S*/)
           end
         end
@@ -1130,12 +1130,12 @@ RSpec.describe SchemesController, type: :request do
           expect(Scheme.last.scheme_type).to eq("Foyer")
           expect(Scheme.last.sensitive).to eq("Yes")
           expect(Scheme.last.registered_under_care_act).to eq("No")
-          expect(Scheme.last.id).not_to eq(nil)
-          expect(Scheme.last.has_other_client_group).to eq(nil)
-          expect(Scheme.last.primary_client_group).to eq(nil)
-          expect(Scheme.last.secondary_client_group).to eq(nil)
-          expect(Scheme.last.support_type).to eq(nil)
-          expect(Scheme.last.intended_stay).to eq(nil)
+          expect(Scheme.last.id).not_to be_nil
+          expect(Scheme.last.has_other_client_group).to be_nil
+          expect(Scheme.last.primary_client_group).to be_nil
+          expect(Scheme.last.secondary_client_group).to be_nil
+          expect(Scheme.last.support_type).to be_nil
+          expect(Scheme.last.intended_stay).to be_nil
           expect(Scheme.last.id_to_display).to match(/S*/)
         end
 
@@ -1164,12 +1164,12 @@ RSpec.describe SchemesController, type: :request do
             expect(Scheme.last.scheme_type).to eq("Foyer")
             expect(Scheme.last.sensitive).to eq("Yes")
             expect(Scheme.last.registered_under_care_act).to eq("No")
-            expect(Scheme.last.id).not_to eq(nil)
-            expect(Scheme.last.has_other_client_group).to eq(nil)
-            expect(Scheme.last.primary_client_group).to eq(nil)
-            expect(Scheme.last.secondary_client_group).to eq(nil)
-            expect(Scheme.last.support_type).to eq(nil)
-            expect(Scheme.last.intended_stay).to eq(nil)
+            expect(Scheme.last.id).not_to be_nil
+            expect(Scheme.last.has_other_client_group).to be_nil
+            expect(Scheme.last.primary_client_group).to be_nil
+            expect(Scheme.last.secondary_client_group).to be_nil
+            expect(Scheme.last.support_type).to be_nil
+            expect(Scheme.last.intended_stay).to be_nil
             expect(Scheme.last.id_to_display).to match(/S*/)
           end
         end
@@ -1264,12 +1264,12 @@ RSpec.describe SchemesController, type: :request do
         expect(Scheme.last.scheme_type).to eq("Foyer")
         expect(Scheme.last.sensitive).to eq("Yes")
         expect(Scheme.last.registered_under_care_act).to eq("No")
-        expect(Scheme.last.id).not_to eq(nil)
-        expect(Scheme.last.has_other_client_group).to eq(nil)
-        expect(Scheme.last.primary_client_group).to eq(nil)
-        expect(Scheme.last.secondary_client_group).to eq(nil)
-        expect(Scheme.last.support_type).to eq(nil)
-        expect(Scheme.last.intended_stay).to eq(nil)
+        expect(Scheme.last.id).not_to be_nil
+        expect(Scheme.last.has_other_client_group).to be_nil
+        expect(Scheme.last.primary_client_group).to be_nil
+        expect(Scheme.last.secondary_client_group).to be_nil
+        expect(Scheme.last.support_type).to be_nil
+        expect(Scheme.last.intended_stay).to be_nil
         expect(Scheme.last.id_to_display).to match(/S*/)
       end
 
@@ -1297,12 +1297,12 @@ RSpec.describe SchemesController, type: :request do
           expect(Scheme.last.scheme_type).to eq("Foyer")
           expect(Scheme.last.sensitive).to eq("Yes")
           expect(Scheme.last.registered_under_care_act).to eq("No")
-          expect(Scheme.last.id).not_to eq(nil)
-          expect(Scheme.last.has_other_client_group).to eq(nil)
-          expect(Scheme.last.primary_client_group).to eq(nil)
-          expect(Scheme.last.secondary_client_group).to eq(nil)
-          expect(Scheme.last.support_type).to eq(nil)
-          expect(Scheme.last.intended_stay).to eq(nil)
+          expect(Scheme.last.id).not_to be_nil
+          expect(Scheme.last.has_other_client_group).to be_nil
+          expect(Scheme.last.primary_client_group).to be_nil
+          expect(Scheme.last.secondary_client_group).to be_nil
+          expect(Scheme.last.support_type).to be_nil
+          expect(Scheme.last.intended_stay).to be_nil
           expect(Scheme.last.id_to_display).to match(/S*/)
         end
       end
@@ -1384,7 +1384,7 @@ RSpec.describe SchemesController, type: :request do
         let(:params) { { scheme: { page: "check-answers" } } }
 
         it "is not confirmed" do
-          expect(scheme_to_update.confirmed).to eq(nil)
+          expect(scheme_to_update.confirmed).to be_nil
         end
 
         context "when confirming finished scheme" do
@@ -1395,7 +1395,7 @@ RSpec.describe SchemesController, type: :request do
           end
 
           it "confirms scheme" do
-            expect(scheme_to_update.confirmed).to eq(true)
+            expect(scheme_to_update.confirmed).to be(true)
           end
         end
       end
@@ -1693,7 +1693,7 @@ RSpec.describe SchemesController, type: :request do
         let(:params) { { scheme: { page: "check-answers" } } }
 
         it "is not confirmed" do
-          expect(scheme_to_update.confirmed).to eq(nil)
+          expect(scheme_to_update.confirmed).to be_nil
         end
 
         context "when confirming finished scheme" do
@@ -1704,7 +1704,7 @@ RSpec.describe SchemesController, type: :request do
           end
 
           it "confirms scheme" do
-            expect(scheme_to_update.confirmed).to eq(true)
+            expect(scheme_to_update.confirmed).to be(true)
           end
         end
       end
@@ -1761,13 +1761,13 @@ RSpec.describe SchemesController, type: :request do
           let(:params) { { scheme: { page: "check-answers", confirmed: "true" } } }
 
           it "marks the scheme as confirmed" do
-            expect(scheme_to_update.reload.confirmed?).to eq(true)
+            expect(scheme_to_update.reload.confirmed?).to be(true)
           end
 
           it "marks all the scheme locations as confirmed given they are complete" do
-            expect(scheme_to_update.locations.count > 0).to eq(true)
+            expect(scheme_to_update.locations.count > 0).to be(true)
             scheme_to_update.locations.each do |location|
-              expect(location.confirmed?).to eq(true)
+              expect(location.confirmed?).to be(true)
             end
           end
         end
@@ -2812,14 +2812,14 @@ RSpec.describe SchemesController, type: :request do
             expect(lettings_log.scheme).to eq(scheme)
             expect(lettings_log.scheme).to eq(scheme)
             lettings_log.reload
-            expect(lettings_log.scheme).to eq(nil)
-            expect(lettings_log.scheme).to eq(nil)
+            expect(lettings_log.scheme).to be_nil
+            expect(lettings_log.scheme).to be_nil
           end
 
           it "marks log as needing attention" do
-            expect(lettings_log.unresolved).to eq(nil)
+            expect(lettings_log.unresolved).to be_nil
             lettings_log.reload
-            expect(lettings_log.unresolved).to eq(true)
+            expect(lettings_log.unresolved).to be(true)
           end
 
           it "sends deactivation emails" do
@@ -2844,9 +2844,9 @@ RSpec.describe SchemesController, type: :request do
           end
 
           it "does not mark log as needing attention" do
-            expect(lettings_log.unresolved).to eq(nil)
+            expect(lettings_log.unresolved).to be_nil
             lettings_log.reload
-            expect(lettings_log.unresolved).to eq(nil)
+            expect(lettings_log.unresolved).to be_nil
           end
         end
 
@@ -2869,13 +2869,13 @@ RSpec.describe SchemesController, type: :request do
           it "clears the scheme answer" do
             expect(lettings_log.scheme).to eq(scheme)
             lettings_log.reload
-            expect(lettings_log.scheme).to eq(nil)
+            expect(lettings_log.scheme).to be_nil
           end
 
           it "marks log as needing attention" do
-            expect(lettings_log.unresolved).to eq(nil)
+            expect(lettings_log.unresolved).to be_nil
             lettings_log.reload
-            expect(lettings_log.unresolved).to eq(true)
+            expect(lettings_log.unresolved).to be(true)
           end
         end
 
@@ -2897,13 +2897,13 @@ RSpec.describe SchemesController, type: :request do
           it "clears the scheme answer" do
             expect(lettings_log.scheme).to eq(scheme)
             lettings_log.reload
-            expect(lettings_log.scheme).to eq(nil)
+            expect(lettings_log.scheme).to be_nil
           end
 
           it "marks log as needing attention" do
-            expect(lettings_log.unresolved).to eq(nil)
+            expect(lettings_log.unresolved).to be_nil
             lettings_log.reload
-            expect(lettings_log.unresolved).to eq(true)
+            expect(lettings_log.unresolved).to be(true)
           end
         end
 
@@ -3338,14 +3338,14 @@ RSpec.describe SchemesController, type: :request do
         it "deletes the scheme" do
           scheme.reload
           expect(scheme.status).to eq(:deleted)
-          expect(scheme.discarded_at).not_to be nil
+          expect(scheme.discarded_at).not_to be_nil
         end
 
         it "deletes associated locations" do
           locations.each do |location|
             location.reload
             expect(location.status).to eq(:deleted)
-            expect(location.discarded_at).not_to be nil
+            expect(location.discarded_at).not_to be_nil
           end
         end
 
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 257bd681a..d67467998 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -440,7 +440,7 @@ RSpec.describe UsersController, type: :request do
         get "/users/search", headers:, params: { query: "test_name" }
         result = JSON.parse(response.body)
         expect(result.count).to eq(2)
-        expect(result.keys).to match_array([org_user.id.to_s, managing_user.id.to_s])
+        expect(result.keys).to contain_exactly(org_user.id.to_s, managing_user.id.to_s)
       end
     end
 
@@ -1250,7 +1250,7 @@ RSpec.describe UsersController, type: :request do
         get "/users/search", headers:, params: { query: "test_name" }
         result = JSON.parse(response.body)
         expect(result.count).to eq(2)
-        expect(result.keys).to match_array([org_user.id.to_s, managing_user.id.to_s])
+        expect(result.keys).to contain_exactly(org_user.id.to_s, managing_user.id.to_s)
       end
     end
 
@@ -2419,7 +2419,7 @@ RSpec.describe UsersController, type: :request do
       it "deletes the user" do
         other_user.reload
         expect(other_user.status).to eq(:deleted)
-        expect(other_user.discarded_at).not_to be nil
+        expect(other_user.discarded_at).not_to be_nil
       end
 
       it "redirects to the users list and displays a notice that the user has been deleted" do
@@ -2448,7 +2448,7 @@ RSpec.describe UsersController, type: :request do
         get "/users/search", headers:, params: { query: "test_name" }
         result = JSON.parse(response.body)
         expect(result.count).to eq(4)
-        expect(result.keys).to match_array([org_user.id.to_s, managing_user.id.to_s, owner_user.id.to_s, other_user.id.to_s])
+        expect(result.keys).to contain_exactly(org_user.id.to_s, managing_user.id.to_s, owner_user.id.to_s, other_user.id.to_s)
       end
     end
 
diff --git a/spec/services/bulk_upload/lettings/log_creator_spec.rb b/spec/services/bulk_upload/lettings/log_creator_spec.rb
index 408d36c21..4d3f7df83 100644
--- a/spec/services/bulk_upload/lettings/log_creator_spec.rb
+++ b/spec/services/bulk_upload/lettings/log_creator_spec.rb
@@ -18,10 +18,7 @@ RSpec.describe BulkUpload::Lettings::LogCreator do
   before do
     allow(Object.const_get("BulkUpload::Lettings::Year#{year}::CsvParser")).to receive(:new).and_return(csv_parser)
     allow(csv_parser).to receive(:row_parsers).and_return([row_parser])
-    allow(row_parser).to receive(:log).and_return(log)
-    allow(row_parser).to receive(:bulk_upload=).and_return(true)
-    allow(row_parser).to receive(:valid?).and_return(true)
-    allow(row_parser).to receive(:blank_row?).and_return(false)
+    allow(row_parser).to receive_messages(log: log, 'bulk_upload=': true, valid?: true, blank_row?: false)
   end
 
   describe "#call" do
@@ -154,7 +151,7 @@ RSpec.describe BulkUpload::Lettings::LogCreator do
         log = LettingsLog.last
         expect(log.age1).to be(22)
         expect(log.ecstat1).to be(5)
-        expect(log.retirement_value_check).to be(nil)
+        expect(log.retirement_value_check).to be_nil
       end
     end
   end
diff --git a/spec/services/bulk_upload/lettings/validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb
index 6823c5ca3..ef5386cc9 100644
--- a/spec/services/bulk_upload/lettings/validator_spec.rb
+++ b/spec/services/bulk_upload/lettings/validator_spec.rb
@@ -301,7 +301,7 @@ RSpec.describe BulkUpload::Lettings::Validator do
         file.close
       end
 
-      it "will not create logs" do
+      it "does not create logs" do
         validator.call
         expect(validator.block_log_creation_reason).to eq("setup_errors")
       end
diff --git a/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb
index f8cca52ef..bc13b5200 100644
--- a/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb
@@ -168,7 +168,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do
     end
   end
 
-  describe "#column_for_field", aggregate_failures: true do
+  describe "#column_for_field", :aggregate_failures do
     context "when with headers using default ordering" do
       before do
         file.write("Question\n")
diff --git a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
index fcf0c5a9d..c076b544a 100644
--- a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
@@ -240,7 +240,9 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
             expect(parser).to be_valid
           end
 
-          xit "instantiates a log with everything completed", aggregate_failures: true do
+          it "instantiates a log with everything completed", :aggregate_failures do
+            skip "Doesn't seem to work. The 2023 parser isn't used any more so not worth fixing"
+
             questions = parser.send(:questions).reject do |q|
               parser.send(:log).optional_fields.include?(q.id) || q.completed?(parser.send(:log))
             end
@@ -2298,7 +2300,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
         }
       end
 
-      it "sets value from correct mapping", aggregate_failures: true do
+      it "sets value from correct mapping", :aggregate_failures do
         expect(parser.log.ecstat1).to eq(1)
         expect(parser.log.ecstat2).to eq(2)
         expect(parser.log.ecstat3).to eq(6)
@@ -2324,7 +2326,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
         }
       end
 
-      it "sets value from correct mapping", aggregate_failures: true do
+      it "sets value from correct mapping", :aggregate_failures do
         expect(parser.log.relat2).to eq("P")
         expect(parser.log.relat3).to eq("C")
         expect(parser.log.relat4).to eq("X")
@@ -2473,7 +2475,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
         let(:attributes) { { bulk_upload:, field_4: 1, field_125: "1" } }
 
         it "sets correct value from mapping" do
-          expect(parser.log.household_charge).to eq(nil)
+          expect(parser.log.household_charge).to be_nil
         end
       end
 
diff --git a/spec/services/bulk_upload/lettings/year2024/csv_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/csv_parser_spec.rb
index b736dc5e5..e11f2fa19 100644
--- a/spec/services/bulk_upload/lettings/year2024/csv_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2024/csv_parser_spec.rb
@@ -196,7 +196,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::CsvParser do
     end
   end
 
-  describe "#column_for_field", aggregate_failures: true do
+  describe "#column_for_field", :aggregate_failures do
     context "when with headers using default ordering" do
       before do
         file.write("Question\n")
diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
index 091ac68d9..f3b5d5118 100644
--- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
@@ -259,7 +259,9 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
             expect(parser).to be_valid
           end
 
-          xit "instantiates a log with everything completed", aggregate_failures: true do
+          it "instantiates a log with everything completed", :aggregate_failures do
+            skip "Doesn't seem to work. The 2024 parser isn't used any more so not worth fixing"
+
             parser.valid?
 
             questions = parser.send(:questions).reject do |q|
@@ -1973,8 +1975,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { setup_section_params.merge({ field_45: "123123" }) }
 
         it "is correctly set" do
-          expect(parser.log.nationality_all).to be(nil)
-          expect(parser.log.nationality_all_group).to be(nil)
+          expect(parser.log.nationality_all).to be_nil
+          expect(parser.log.nationality_all_group).to be_nil
         end
 
         it "adds an error to field_45" do
@@ -2050,7 +2052,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
       end
 
       it "does not add duplicate logs validation to the blank row" do
-        expect(parser.log_already_exists?).to eq(false)
+        expect(parser.log_already_exists?).to be(false)
       end
     end
   end
@@ -2465,7 +2467,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         }
       end
 
-      it "sets value from correct mapping", aggregate_failures: true do
+      it "sets value from correct mapping", :aggregate_failures do
         expect(parser.log.ecstat1).to eq(1)
         expect(parser.log.ecstat2).to eq(2)
         expect(parser.log.ecstat3).to eq(6)
@@ -2491,7 +2493,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         }
       end
 
-      it "sets value from correct mapping", aggregate_failures: true do
+      it "sets value from correct mapping", :aggregate_failures do
         expect(parser.log.relat2).to eq("P")
         expect(parser.log.relat3).to eq("C")
         expect(parser.log.relat4).to eq("X")
@@ -2686,7 +2688,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
         let(:attributes) { { bulk_upload:, field_4: 1, field_122: "1" } }
 
         it "sets correct value from mapping" do
-          expect(parser.log.household_charge).to eq(nil)
+          expect(parser.log.household_charge).to be_nil
         end
       end
 
diff --git a/spec/services/bulk_upload/lettings/year2025/csv_parser_spec.rb b/spec/services/bulk_upload/lettings/year2025/csv_parser_spec.rb
index dcb1cd354..b53222f7b 100644
--- a/spec/services/bulk_upload/lettings/year2025/csv_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2025/csv_parser_spec.rb
@@ -196,7 +196,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::CsvParser do
     end
   end
 
-  describe "#column_for_field", aggregate_failures: true do
+  describe "#column_for_field", :aggregate_failures do
     context "when with headers using default ordering" do
       before do
         file.write("Question\n")
diff --git a/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb
index 951838e53..e8fe5cf8e 100644
--- a/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb
@@ -259,7 +259,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
             expect(parser).to be_valid
           end
 
-          it "instantiates a log with everything completed", aggregate_failures: true do
+          it "instantiates a log with everything completed", :aggregate_failures do
             parser.valid?
 
             questions = parser.send(:questions).reject do |q|
@@ -1782,8 +1782,8 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
         let(:attributes) { setup_section_params.merge({ field_45: "123123" }) }
 
         it "is correctly set" do
-          expect(parser.log.nationality_all).to be(nil)
-          expect(parser.log.nationality_all_group).to be(nil)
+          expect(parser.log.nationality_all).to be_nil
+          expect(parser.log.nationality_all_group).to be_nil
         end
 
         it "adds an error to field_45" do
@@ -1859,7 +1859,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
       end
 
       it "does not add duplicate logs validation to the blank row" do
-        expect(parser.log_already_exists?).to eq(false)
+        expect(parser.log_already_exists?).to be(false)
       end
     end
   end
@@ -2274,7 +2274,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
         }
       end
 
-      it "sets value from correct mapping", aggregate_failures: true do
+      it "sets value from correct mapping", :aggregate_failures do
         expect(parser.log.ecstat1).to eq(1)
         expect(parser.log.ecstat2).to eq(2)
         expect(parser.log.ecstat3).to eq(6)
@@ -2300,7 +2300,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
         }
       end
 
-      it "sets value from correct mapping", aggregate_failures: true do
+      it "sets value from correct mapping", :aggregate_failures do
         expect(parser.log.relat2).to eq("P")
         expect(parser.log.relat3).to eq("X")
         expect(parser.log.relat4).to eq("X")
@@ -2459,7 +2459,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
         let(:attributes) { { bulk_upload:, field_4: 1, field_122: "1" } }
 
         it "sets correct value from mapping" do
-          expect(parser.log.household_charge).to eq(nil)
+          expect(parser.log.household_charge).to be_nil
         end
       end
 
diff --git a/spec/services/bulk_upload/lettings/year2026/csv_parser_spec.rb b/spec/services/bulk_upload/lettings/year2026/csv_parser_spec.rb
index d127767e0..0452116be 100644
--- a/spec/services/bulk_upload/lettings/year2026/csv_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2026/csv_parser_spec.rb
@@ -196,7 +196,7 @@ RSpec.describe BulkUpload::Lettings::Year2026::CsvParser do
     end
   end
 
-  describe "#column_for_field", aggregate_failures: true do
+  describe "#column_for_field", :aggregate_failures do
     context "when with headers using default ordering" do
       before do
         file.write("Question\n")
diff --git a/spec/services/bulk_upload/lettings/year2026/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2026/row_parser_spec.rb
index dc6a81e0a..19847dec5 100644
--- a/spec/services/bulk_upload/lettings/year2026/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2026/row_parser_spec.rb
@@ -278,7 +278,7 @@ RSpec.describe BulkUpload::Lettings::Year2026::RowParser do
             expect(parser).to be_valid
           end
 
-          it "instantiates a log with everything completed", aggregate_failures: true do
+          it "instantiates a log with everything completed", :aggregate_failures do
             parser.valid?
 
             questions = parser.send(:questions).reject do |q|
@@ -2046,8 +2046,8 @@ RSpec.describe BulkUpload::Lettings::Year2026::RowParser do
         let(:attributes) { setup_section_params.merge({ field_46: "123123" }) }
 
         it "is correctly set" do
-          expect(parser.log.nationality_all).to be(nil)
-          expect(parser.log.nationality_all_group).to be(nil)
+          expect(parser.log.nationality_all).to be_nil
+          expect(parser.log.nationality_all_group).to be_nil
         end
 
         it "adds an error to field_46" do
@@ -2127,7 +2127,7 @@ RSpec.describe BulkUpload::Lettings::Year2026::RowParser do
       end
 
       it "does not add duplicate logs validation to the blank row" do
-        expect(parser.log_already_exists?).to eq(false)
+        expect(parser.log_already_exists?).to be(false)
       end
     end
   end
@@ -2534,7 +2534,7 @@ RSpec.describe BulkUpload::Lettings::Year2026::RowParser do
         }
       end
 
-      it "sets value from correct mapping", aggregate_failures: true do
+      it "sets value from correct mapping", :aggregate_failures do
         expect(parser.log.ecstat1).to eq(1)
         expect(parser.log.ecstat2).to eq(2)
         expect(parser.log.ecstat3).to eq(6)
@@ -2560,7 +2560,7 @@ RSpec.describe BulkUpload::Lettings::Year2026::RowParser do
         }
       end
 
-      it "sets value from correct mapping", aggregate_failures: true do
+      it "sets value from correct mapping", :aggregate_failures do
         expect(parser.log.relat2).to eq("P")
         expect(parser.log.relat3).to eq("X")
         expect(parser.log.relat4).to eq("X")
@@ -2719,7 +2719,7 @@ RSpec.describe BulkUpload::Lettings::Year2026::RowParser do
         let(:attributes) { { bulk_upload:, field_4: 1, field_140: "1" } }
 
         it "sets correct value from mapping" do
-          expect(parser.log.household_charge).to eq(nil)
+          expect(parser.log.household_charge).to be_nil
         end
       end
 
diff --git a/spec/services/bulk_upload/processor_spec.rb b/spec/services/bulk_upload/processor_spec.rb
index 27f1aebed..1e7a33808 100644
--- a/spec/services/bulk_upload/processor_spec.rb
+++ b/spec/services/bulk_upload/processor_spec.rb
@@ -72,7 +72,7 @@ RSpec.describe BulkUpload::Processor do
       end
 
       it "sends failure email" do
-        mail_double = instance_double("ActionMailer::MessageDelivery", deliver_later: nil)
+        mail_double = instance_double(ActionMailer::MessageDelivery, deliver_later: nil)
 
         allow(BulkUploadMailer).to receive(:send_bulk_upload_failed_service_error_mail).and_return(mail_double)
 
@@ -107,7 +107,7 @@ RSpec.describe BulkUpload::Processor do
       end
 
       it "sends failure email" do
-        mail_double = instance_double("ActionMailer::MessageDelivery", deliver_later: nil)
+        mail_double = instance_double(ActionMailer::MessageDelivery, deliver_later: nil)
 
         allow(BulkUploadMailer).to receive(:send_bulk_upload_failed_service_error_mail).and_return(mail_double)
 
@@ -138,7 +138,7 @@ RSpec.describe BulkUpload::Processor do
       end
 
       it "sends setup failure email" do
-        mail_double = instance_double("ActionMailer::MessageDelivery", deliver_later: nil)
+        mail_double = instance_double(ActionMailer::MessageDelivery, deliver_later: nil)
 
         allow(BulkUploadMailer).to receive(:send_bulk_upload_failed_file_setup_error_mail).and_return(mail_double)
 
@@ -155,7 +155,7 @@ RSpec.describe BulkUpload::Processor do
       end
 
       it "sends success email" do
-        mail_double = instance_double("ActionMailer::MessageDelivery", deliver_later: nil)
+        mail_double = instance_double(ActionMailer::MessageDelivery, deliver_later: nil)
 
         allow(BulkUploadMailer).to receive(:send_bulk_upload_complete_mail).and_return(mail_double)
 
@@ -170,8 +170,7 @@ RSpec.describe BulkUpload::Processor do
       let(:log) { build(:lettings_log, :setup_completed, assigned_to: user) }
 
       before do
-        allow(mock_validator).to receive(:block_log_creation_reason).and_return(nil)
-        allow(mock_validator).to receive(:soft_validation_errors_only?).and_return(false)
+        allow(mock_validator).to receive_messages(block_log_creation_reason: nil, soft_validation_errors_only?: false)
         allow(FeatureToggle).to receive(:bulk_upload_duplicate_log_check_enabled?).and_return(true)
       end
 
@@ -180,7 +179,7 @@ RSpec.describe BulkUpload::Processor do
       end
 
       it "sends how_to_fix_upload_mail" do
-        mail_double = instance_double("ActionMailer::MessageDelivery", deliver_later: nil)
+        mail_double = instance_double(ActionMailer::MessageDelivery, deliver_later: nil)
 
         allow(BulkUploadMailer).to receive(:send_how_to_fix_upload_mail).and_return(mail_double)
 
@@ -203,8 +202,7 @@ RSpec.describe BulkUpload::Processor do
 
     context "when a bulk upload has logs with only soft validations triggered" do
       before do
-        allow(mock_validator).to receive(:block_log_creation_reason).and_return(nil)
-        allow(mock_validator).to receive(:soft_validation_errors_only?).and_return(true)
+        allow(mock_validator).to receive_messages(block_log_creation_reason: nil, soft_validation_errors_only?: true)
         allow(FeatureToggle).to receive(:bulk_upload_duplicate_log_check_enabled?).and_return(true)
       end
 
@@ -213,10 +211,9 @@ RSpec.describe BulkUpload::Processor do
       end
 
       it "sends check_soft_validations_mail" do
-        mail_double = instance_double("ActionMailer::MessageDelivery", deliver_later: nil)
+        mail_double = instance_double(ActionMailer::MessageDelivery, deliver_later: nil)
 
-        allow(BulkUploadMailer).to receive(:send_check_soft_validations_mail).and_return(mail_double)
-        allow(BulkUploadMailer).to receive(:send_how_to_fix_upload_mail).and_return(mail_double)
+        allow(BulkUploadMailer).to receive_messages(send_check_soft_validations_mail: mail_double, send_how_to_fix_upload_mail: mail_double)
 
         processor.call
 
@@ -249,7 +246,7 @@ RSpec.describe BulkUpload::Processor do
       end
 
       it "sends correct_and_upload_again_mail" do
-        mail_double = instance_double("ActionMailer::MessageDelivery", deliver_later: nil)
+        mail_double = instance_double(ActionMailer::MessageDelivery, deliver_later: nil)
 
         allow(BulkUploadMailer).to receive(:send_correct_and_upload_again_mail).and_return(mail_double)
 
@@ -273,7 +270,7 @@ RSpec.describe BulkUpload::Processor do
       end
 
       it "sends correct_and_upload_again_mail" do
-        mail_double = instance_double("ActionMailer::MessageDelivery", deliver_later: nil)
+        mail_double = instance_double(ActionMailer::MessageDelivery, deliver_later: nil)
 
         allow(BulkUploadMailer).to receive(:send_correct_duplicates_and_upload_again_mail).and_return(mail_double)
 
diff --git a/spec/services/bulk_upload/sales/log_creator_spec.rb b/spec/services/bulk_upload/sales/log_creator_spec.rb
index b4fe1f07a..f46e7c95c 100644
--- a/spec/services/bulk_upload/sales/log_creator_spec.rb
+++ b/spec/services/bulk_upload/sales/log_creator_spec.rb
@@ -18,10 +18,7 @@ RSpec.describe BulkUpload::Sales::LogCreator do
   before do
     allow("BulkUpload::Sales::Year#{year}::CsvParser".constantize).to receive(:new).and_return(csv_parser)
     allow(csv_parser).to receive(:row_parsers).and_return([row_parser])
-    allow(row_parser).to receive(:log).and_return(log)
-    allow(row_parser).to receive(:bulk_upload=).and_return(true)
-    allow(row_parser).to receive(:valid?).and_return(true)
-    allow(row_parser).to receive(:blank_row?).and_return(false)
+    allow(row_parser).to receive_messages(log: log, 'bulk_upload=': true, valid?: true, blank_row?: false)
   end
 
   it "creates a parser for the correct year" do
@@ -165,7 +162,7 @@ RSpec.describe BulkUpload::Sales::LogCreator do
         log = SalesLog.last
         expect(log.age1).to be(30)
         expect(log.ecstat1).to be(5)
-        expect(log.retirement_value_check).to be(nil)
+        expect(log.retirement_value_check).to be_nil
       end
     end
   end
diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb
index a37eff505..263bb92f8 100644
--- a/spec/services/bulk_upload/sales/validator_spec.rb
+++ b/spec/services/bulk_upload/sales/validator_spec.rb
@@ -286,7 +286,7 @@ RSpec.describe BulkUpload::Sales::Validator do
         file.close
       end
 
-      it "will not create logs" do
+      it "does not create logs" do
         validator.call
         expect(validator.block_log_creation_reason).to eq("setup_errors")
       end
diff --git a/spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb b/spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb
index 794cce0e3..b4e1c5e7c 100644
--- a/spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb
@@ -113,7 +113,7 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do
     end
   end
 
-  describe "#column_for_field", aggregate_failures: true do
+  describe "#column_for_field", :aggregate_failures do
     context "when headers present" do
       before do
         file.write("Question\n")
diff --git a/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb
index 8347647cb..55146e22e 100644
--- a/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2023/row_parser_spec.rb
@@ -273,7 +273,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
           expect(parser).to be_valid
         end
 
-        it "instantiates a log with everything completed", aggregate_failures: true do
+        it "instantiates a log with everything completed", :aggregate_failures do
           questions = parser.send(:questions).reject do |q|
             parser.send(:log).optional_fields.include?(q.id) || q.completed?(parser.send(:log))
           end
@@ -931,7 +931,7 @@ RSpec.describe BulkUpload::Sales::Year2023::RowParser do
 
             it "does not set ##{age}" do
               parser.valid?
-              expect(parser.errors[field.to_sym]).to include(/#{I18n.t("validations.sales.2023.bulk_upload.not_answered", question: "")}/)
+              expect(parser.errors[field.to_sym]).to include(/#{I18n.t('validations.sales.2023.bulk_upload.not_answered', question: '')}/)
             end
           end
         end
diff --git a/spec/services/bulk_upload/sales/year2024/csv_parser_spec.rb b/spec/services/bulk_upload/sales/year2024/csv_parser_spec.rb
index 49f48f607..4eb9a0c47 100644
--- a/spec/services/bulk_upload/sales/year2024/csv_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2024/csv_parser_spec.rb
@@ -150,7 +150,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
     end
   end
 
-  describe "#column_for_field", aggregate_failures: true do
+  describe "#column_for_field", :aggregate_failures do
     context "when headers present" do
       before do
         file.write("Question\n")
diff --git a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
index b4e9e1b49..984cc2f33 100644
--- a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
@@ -283,7 +283,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
           expect(parser).to be_valid
         end
 
-        it "instantiates a log with everything completed", aggregate_failures: true do
+        it "instantiates a log with everything completed", :aggregate_failures do
           parser.valid?
 
           questions = parser.send(:questions).reject do |q|
@@ -1546,7 +1546,7 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       end
 
       it "does not add duplicate logs validation to the blank row" do
-        expect(parser.log_already_exists?).to eq(false)
+        expect(parser.log_already_exists?).to be(false)
       end
     end
   end
@@ -1740,8 +1740,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
 
         it "is correctly set" do
           parser.valid?
-          expect(parser.log.nationality_all).to be(nil)
-          expect(parser.log.nationality_all_group).to be(nil)
+          expect(parser.log.nationality_all).to be_nil
+          expect(parser.log.nationality_all_group).to be_nil
           expect(parser.errors["field_34"]).to include(I18n.t("validations.sales.2024.bulk_upload.nationality.invalid"))
         end
       end
@@ -1825,8 +1825,8 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
 
         it "is correctly set" do
           parser.valid?
-          expect(parser.log.nationality_all_buyer2).to be(nil)
-          expect(parser.log.nationality_all_buyer2_group).to be(nil)
+          expect(parser.log.nationality_all_buyer2).to be_nil
+          expect(parser.log.nationality_all_buyer2_group).to be_nil
           expect(parser.errors["field_41"]).to include(I18n.t("validations.sales.2024.bulk_upload.nationality.invalid"))
         end
       end
diff --git a/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb b/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb
index 849e6bf2f..6a46c16ad 100644
--- a/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb
@@ -150,7 +150,7 @@ RSpec.describe BulkUpload::Sales::Year2025::CsvParser do
     end
   end
 
-  describe "#column_for_field", aggregate_failures: true do
+  describe "#column_for_field", :aggregate_failures do
     context "when headers present" do
       before do
         file.write("Question\n")
diff --git a/spec/services/bulk_upload/sales/year2025/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2025/row_parser_spec.rb
index 0074b3712..6306249eb 100644
--- a/spec/services/bulk_upload/sales/year2025/row_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2025/row_parser_spec.rb
@@ -282,7 +282,7 @@ RSpec.describe BulkUpload::Sales::Year2025::RowParser do
           expect(parser).to be_valid
         end
 
-        it "instantiates a log with everything completed", aggregate_failures: true do
+        it "instantiates a log with everything completed", :aggregate_failures do
           parser.valid?
 
           questions = parser.send(:questions).reject do |q|
@@ -1436,7 +1436,7 @@ RSpec.describe BulkUpload::Sales::Year2025::RowParser do
       end
 
       it "does not add duplicate logs validation to the blank row" do
-        expect(parser.log_already_exists?).to eq(false)
+        expect(parser.log_already_exists?).to be(false)
       end
     end
   end
@@ -1630,8 +1630,8 @@ RSpec.describe BulkUpload::Sales::Year2025::RowParser do
 
         it "is correctly set" do
           parser.valid?
-          expect(parser.log.nationality_all).to be(nil)
-          expect(parser.log.nationality_all_group).to be(nil)
+          expect(parser.log.nationality_all).to be_nil
+          expect(parser.log.nationality_all_group).to be_nil
           expect(parser.errors["field_31"]).to include(I18n.t("validations.sales.2025.bulk_upload.nationality.invalid"))
         end
       end
@@ -1715,8 +1715,8 @@ RSpec.describe BulkUpload::Sales::Year2025::RowParser do
 
         it "is correctly set" do
           parser.valid?
-          expect(parser.log.nationality_all_buyer2).to be(nil)
-          expect(parser.log.nationality_all_buyer2_group).to be(nil)
+          expect(parser.log.nationality_all_buyer2).to be_nil
+          expect(parser.log.nationality_all_buyer2_group).to be_nil
           expect(parser.errors["field_38"]).to include(I18n.t("validations.sales.2025.bulk_upload.nationality.invalid"))
         end
       end
diff --git a/spec/services/bulk_upload/sales/year2026/csv_parser_spec.rb b/spec/services/bulk_upload/sales/year2026/csv_parser_spec.rb
index ea97dfac7..09e135400 100644
--- a/spec/services/bulk_upload/sales/year2026/csv_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2026/csv_parser_spec.rb
@@ -150,7 +150,7 @@ RSpec.describe BulkUpload::Sales::Year2026::CsvParser do
     end
   end
 
-  describe "#column_for_field", aggregate_failures: true do
+  describe "#column_for_field", :aggregate_failures do
     context "when headers present" do
       before do
         file.write("Question\n")
diff --git a/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb
index f9fb2aa2c..b7505d7b8 100644
--- a/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb
@@ -288,7 +288,7 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do
           expect(parser).to be_valid
         end
 
-        it "instantiates a log with everything completed", aggregate_failures: true do
+        it "instantiates a log with everything completed", :aggregate_failures do
           parser.valid?
 
           questions = parser.send(:questions).reject do |q|
@@ -1442,7 +1442,7 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do
       end
 
       it "does not add duplicate logs validation to the blank row" do
-        expect(parser.log_already_exists?).to eq(false)
+        expect(parser.log_already_exists?).to be(false)
       end
     end
   end
@@ -1636,8 +1636,8 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do
 
         it "is correctly set" do
           parser.valid?
-          expect(parser.log.nationality_all).to be(nil)
-          expect(parser.log.nationality_all_group).to be(nil)
+          expect(parser.log.nationality_all).to be_nil
+          expect(parser.log.nationality_all_group).to be_nil
           expect(parser.errors["field_31"]).to include(I18n.t("validations.sales.2026.bulk_upload.nationality.invalid"))
         end
       end
@@ -1721,8 +1721,8 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do
 
         it "is correctly set" do
           parser.valid?
-          expect(parser.log.nationality_all_buyer2).to be(nil)
-          expect(parser.log.nationality_all_buyer2_group).to be(nil)
+          expect(parser.log.nationality_all_buyer2).to be_nil
+          expect(parser.log.nationality_all_buyer2_group).to be_nil
           expect(parser.errors["field_38"]).to include(I18n.t("validations.sales.2026.bulk_upload.nationality.invalid"))
         end
       end
diff --git a/spec/services/csv/lettings_log_csv_service_spec.rb b/spec/services/csv/lettings_log_csv_service_spec.rb
index 02af1a1a1..0b4396b9e 100644
--- a/spec/services/csv/lettings_log_csv_service_spec.rb
+++ b/spec/services/csv/lettings_log_csv_service_spec.rb
@@ -50,9 +50,7 @@ RSpec.describe Csv::LettingsLogCsvService do
       before do
         allow(FormHandler).to receive(:instance).and_return(form_handler_mock)
         allow(form_handler_mock).to receive(:form_name_from_start_year)
-        allow(form_handler_mock).to receive(:get_form).and_return(lettings_form)
-        allow(form_handler_mock).to receive(:ordered_questions_for_year).and_return(lettings_form.questions)
-        allow(form_handler_mock).to receive(:lettings_in_crossover_period?).and_return(true)
+        allow(form_handler_mock).to receive_messages(get_form: lettings_form, ordered_questions_for_year: lettings_form.questions, lettings_in_crossover_period?: true)
       end
 
       it "calls the form handler to get all questions for the specified year" do
diff --git a/spec/services/csv/sales_log_csv_service_spec.rb b/spec/services/csv/sales_log_csv_service_spec.rb
index 00fe87e98..a68403378 100644
--- a/spec/services/csv/sales_log_csv_service_spec.rb
+++ b/spec/services/csv/sales_log_csv_service_spec.rb
@@ -91,8 +91,7 @@ RSpec.describe Csv::SalesLogCsvService do
     before do
       allow(FormHandler).to receive(:instance).and_return(form_handler_mock)
       allow(form_handler_mock).to receive(:form_name_from_start_year)
-      allow(form_handler_mock).to receive(:get_form).and_return(sales_form)
-      allow(form_handler_mock).to receive(:ordered_questions_for_year).and_return(sales_form.questions)
+      allow(form_handler_mock).to receive_messages(get_form: sales_form, ordered_questions_for_year: sales_form.questions)
     end
 
     it "calls the form handler to get all questions in order when initialized" do
diff --git a/spec/services/exports/export_service_spec.rb b/spec/services/exports/export_service_spec.rb
index 051a0f38d..09e22127d 100644
--- a/spec/services/exports/export_service_spec.rb
+++ b/spec/services/exports/export_service_spec.rb
@@ -7,9 +7,9 @@ RSpec.describe Exports::ExportService do
   let(:expected_master_manifest_filename) { "Manifest_2022_05_01_0001.csv" }
   let(:start_time) { Time.zone.local(2022, 5, 1) }
   let(:user) { FactoryBot.create(:user, email: "test1@example.com") }
-  let(:organisations_export_service) { instance_double("Exports::OrganisationExportService", export_xml_organisations: {}) }
-  let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: {}) }
-  let(:sales_logs_export_service) { instance_double("Exports::SalesLogExportService", export_xml_sales_logs: {}) }
+  let(:organisations_export_service) { instance_double(Exports::OrganisationExportService, export_xml_organisations: {}) }
+  let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: {}) }
+  let(:sales_logs_export_service) { instance_double(Exports::SalesLogExportService, export_xml_sales_logs: {}) }
 
   before do
     Timecop.freeze(start_time)
@@ -29,7 +29,7 @@ RSpec.describe Exports::ExportService do
     let(:start_time) { Time.zone.local(2022, 5, 1) }
 
     context "and no lettings archives get created in lettings logs export" do
-      let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: {}) }
+      let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: {}) }
 
       context "and no user or organisation archives get created in user export" do
         it "generates a master manifest with the correct name" do
@@ -48,7 +48,7 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and one user archive gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -66,7 +66,7 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and one organisation archive gets created in organisation export" do
-        let(:organisations_export_service) { instance_double("Exports::OrganisationExportService", export_xml_organisations: { "some_organisation_file_base_name" => start_time }) }
+        let(:organisations_export_service) { instance_double(Exports::OrganisationExportService, export_xml_organisations: { "some_organisation_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -84,8 +84,8 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and user and organisation archive gets created in organisation export" do
-        let(:organisations_export_service) { instance_double("Exports::OrganisationExportService", export_xml_organisations: { "some_organisation_file_base_name" => start_time }) }
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time }) }
+        let(:organisations_export_service) { instance_double(Exports::OrganisationExportService, export_xml_organisations: { "some_organisation_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -104,7 +104,7 @@ RSpec.describe Exports::ExportService do
     end
 
     context "and one lettings archive gets created in lettings logs export" do
-      let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
+      let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
 
       context "and no user archives get created in user export" do
         it "generates a master manifest with the correct name" do
@@ -123,7 +123,7 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and one user archive gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -142,7 +142,7 @@ RSpec.describe Exports::ExportService do
     end
 
     context "and multiple lettings archives get created in lettings logs export" do
-      let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time, "second_file_base_name" => start_time }) }
+      let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time, "second_file_base_name" => start_time }) }
 
       context "and no user archives get created in user export" do
         it "generates a master manifest with the correct name" do
@@ -161,7 +161,7 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and multiple user archive gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -179,8 +179,8 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and multiple user and organisation archives gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
-        let(:organisations_export_service) { instance_double("Exports::OrganisationExportService", export_xml_organisations: { "some_organisation_file_base_name" => start_time, "second_organisation_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
+        let(:organisations_export_service) { instance_double(Exports::OrganisationExportService, export_xml_organisations: { "some_organisation_file_base_name" => start_time, "second_organisation_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -199,8 +199,8 @@ RSpec.describe Exports::ExportService do
     end
 
     context "and multiple sales archives get created in sales logs export" do
-      let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time, "second_file_base_name" => start_time }) }
-      let(:sales_logs_export_service) { instance_double("Exports::SalesLogExportService", export_xml_sales_logs: { "some_sales_file_base_name" => start_time, "second_sales_file_base_name" => start_time }) }
+      let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time, "second_file_base_name" => start_time }) }
+      let(:sales_logs_export_service) { instance_double(Exports::SalesLogExportService, export_xml_sales_logs: { "some_sales_file_base_name" => start_time, "second_sales_file_base_name" => start_time }) }
 
       context "and no user archives get created in user export" do
         it "generates a master manifest with the correct name" do
@@ -219,7 +219,7 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and multiple user archive gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -237,8 +237,8 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and multiple user and organisation archives gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
-        let(:organisations_export_service) { instance_double("Exports::OrganisationExportService", export_xml_organisations: { "some_organisation_file_base_name" => start_time, "second_organisation_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
+        let(:organisations_export_service) { instance_double(Exports::OrganisationExportService, export_xml_organisations: { "some_organisation_file_base_name" => start_time, "second_organisation_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -259,10 +259,10 @@ RSpec.describe Exports::ExportService do
 
   context "when exporting specific lettings log collection" do
     context "and no lettings archives get created in lettings logs export" do
-      let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: {}) }
+      let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: {}) }
 
       context "and user archive gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -281,10 +281,10 @@ RSpec.describe Exports::ExportService do
     end
 
     context "and lettings archive gets created in lettings logs export" do
-      let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
+      let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
 
       context "and user archive gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -306,7 +306,7 @@ RSpec.describe Exports::ExportService do
   context "when exporting user collection" do
     context "and no user archives get created in users export" do
       context "and lettings log archive gets created in lettings logs export" do
-        let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
+        let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -325,10 +325,10 @@ RSpec.describe Exports::ExportService do
     end
 
     context "and users archive gets created in users export" do
-      let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
+      let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
 
       context "and lettings log archive gets created in lettings log export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -349,10 +349,10 @@ RSpec.describe Exports::ExportService do
 
   context "when exporting organisation collection" do
     context "and no organisation archives get created in organisations export" do
-      let(:organisations_export_service) { instance_double("Exports::OrganisationExportService", export_xml_organisations: {}) }
+      let(:organisations_export_service) { instance_double(Exports::OrganisationExportService, export_xml_organisations: {}) }
 
       context "and lettings log archive gets created in lettings logs export" do
-        let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
+        let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -371,10 +371,10 @@ RSpec.describe Exports::ExportService do
     end
 
     context "and organisations archive gets created in organisations export" do
-      let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
+      let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
 
       context "and lettings log archive gets created in lettings log export" do
-        let(:organisations_export_service) { instance_double("Exports::OrganisationExportService", export_xml_organisations: { "some_organisation_file_base_name" => start_time }) }
+        let(:organisations_export_service) { instance_double(Exports::OrganisationExportService, export_xml_organisations: { "some_organisation_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -399,8 +399,8 @@ RSpec.describe Exports::ExportService do
 
     context "when exporting daily XMLs" do
       context "and no sales archives get created in sales logs export" do
-        let(:sales_logs_export_service) { instance_double("Exports::SalesLogExportService", export_xml_sales_logs: {}) }
-        let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: {}) }
+        let(:sales_logs_export_service) { instance_double(Exports::SalesLogExportService, export_xml_sales_logs: {}) }
+        let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: {}) }
 
         context "and no user or organisation archives get created in user export" do
           it "generates a master manifest with the correct name" do
@@ -420,8 +420,8 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and one sales archive gets created in sales logs export" do
-        let(:sales_logs_export_service) { instance_double("Exports::SalesLogExportService", export_xml_sales_logs: { "some_sales_file_base_name" => start_time }) }
-        let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
+        let(:sales_logs_export_service) { instance_double(Exports::SalesLogExportService, export_xml_sales_logs: { "some_sales_file_base_name" => start_time }) }
+        let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time }) }
 
         context "and no user archives get created in user export" do
           it "generates a master manifest with the correct name" do
@@ -440,7 +440,7 @@ RSpec.describe Exports::ExportService do
         end
 
         context "and one user archive gets created in user export" do
-          let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time }) }
+          let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time }) }
 
           it "generates a master manifest with the correct name" do
             expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -459,8 +459,8 @@ RSpec.describe Exports::ExportService do
       end
 
       context "and multiple sales archives get created in sales logs export" do
-        let(:sales_logs_export_service) { instance_double("Exports::SalesLogExportService", export_xml_sales_logs: { "some_sales_file_base_name" => start_time, "second_sales_file_base_name" => start_time }) }
-        let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: { "some_file_base_name" => start_time, "second_file_base_name" => start_time }) }
+        let(:sales_logs_export_service) { instance_double(Exports::SalesLogExportService, export_xml_sales_logs: { "some_sales_file_base_name" => start_time, "second_sales_file_base_name" => start_time }) }
+        let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: { "some_file_base_name" => start_time, "second_file_base_name" => start_time }) }
 
         context "and no user archives get created in user export" do
           it "generates a master manifest with the correct name" do
@@ -479,7 +479,7 @@ RSpec.describe Exports::ExportService do
         end
 
         context "and multiple user archive gets created in user export" do
-          let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
+          let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
 
           it "generates a master manifest with the correct name" do
             expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -497,8 +497,8 @@ RSpec.describe Exports::ExportService do
         end
 
         context "and multiple user and organisation archives gets created in user export" do
-          let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
-          let(:organisations_export_service) { instance_double("Exports::OrganisationExportService", export_xml_organisations: { "some_organisation_file_base_name" => start_time, "second_organisation_file_base_name" => start_time }) }
+          let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time, "second_user_file_base_name" => start_time }) }
+          let(:organisations_export_service) { instance_double(Exports::OrganisationExportService, export_xml_organisations: { "some_organisation_file_base_name" => start_time, "second_organisation_file_base_name" => start_time }) }
 
           it "generates a master manifest with the correct name" do
             expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -521,13 +521,13 @@ RSpec.describe Exports::ExportService do
   context "when exporting specific sales log collection" do
     let(:start_time) { Time.zone.local(2025, 5, 1) }
     let(:expected_master_manifest_filename) { "Manifest_2025_05_01_0001.csv" }
-    let(:lettings_logs_export_service) { instance_double("Exports::LettingsLogExportService", export_xml_lettings_logs: {}) }
+    let(:lettings_logs_export_service) { instance_double(Exports::LettingsLogExportService, export_xml_lettings_logs: {}) }
 
     context "and no sales archives get created in sales logs export" do
-      let(:sales_logs_export_service) { instance_double("Exports::SalesLogExportService", export_xml_sales_logs: {}) }
+      let(:sales_logs_export_service) { instance_double(Exports::SalesLogExportService, export_xml_sales_logs: {}) }
 
       context "and user archive gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
@@ -546,10 +546,10 @@ RSpec.describe Exports::ExportService do
     end
 
     context "and sales archive gets created in sales logs export" do
-      let(:sales_logs_export_service) { instance_double("Exports::SalesLogExportService", export_xml_sales_logs: { "some_sales_file_base_name" => start_time }) }
+      let(:sales_logs_export_service) { instance_double(Exports::SalesLogExportService, export_xml_sales_logs: { "some_sales_file_base_name" => start_time }) }
 
       context "and user archive gets created in user export" do
-        let(:users_export_service) { instance_double("Exports::UserExportService", export_xml_users: { "some_user_file_base_name" => start_time }) }
+        let(:users_export_service) { instance_double(Exports::UserExportService, export_xml_users: { "some_user_file_base_name" => start_time }) }
 
         it "generates a master manifest with the correct name" do
           expect(storage_service).to receive(:write_file).with(expected_master_manifest_filename, any_args)
diff --git a/spec/services/exports/lettings_log_export_service_spec.rb b/spec/services/exports/lettings_log_export_service_spec.rb
index 1875e8725..53dd0fd0f 100644
--- a/spec/services/exports/lettings_log_export_service_spec.rb
+++ b/spec/services/exports/lettings_log_export_service_spec.rb
@@ -26,8 +26,8 @@ RSpec.describe Exports::LettingsLogExportService do
     export_template.sub!(/\{owning_org_name\}/, lettings_log.owning_organisation.name)
     export_template.sub!(/\{managing_org_id\}/, (lettings_log["managing_organisation_id"] + Exports::LettingsLogExportService::LOG_ID_OFFSET).to_s)
     export_template.sub!(/\{managing_org_name\}/, lettings_log.managing_organisation.name)
-    export_template.sub!(/\{location_id\}/, (lettings_log["location_id"]).to_s) if lettings_log.needstype == 2
-    export_template.sub!(/\{scheme_id\}/, (lettings_log["scheme_id"]).to_s) if lettings_log.needstype == 2
+    export_template.sub!(/\{location_id\}/, lettings_log["location_id"].to_s) if lettings_log.needstype == 2
+    export_template.sub!(/\{scheme_id\}/, lettings_log["scheme_id"].to_s) if lettings_log.needstype == 2
     export_template.sub!(/\{log_id\}/, lettings_log["id"].to_s)
   end
 
diff --git a/spec/services/merge/merge_organisations_service_spec.rb b/spec/services/merge/merge_organisations_service_spec.rb
index d669b11a5..29cbf8b1c 100644
--- a/spec/services/merge/merge_organisations_service_spec.rb
+++ b/spec/services/merge/merge_organisations_service_spec.rb
@@ -5,9 +5,8 @@ RSpec.describe Merge::MergeOrganisationsService do
     before do
       Timecop.freeze(Time.zone.local(2024, 3, 1))
       Singleton.__init__(FormHandler)
-      mail_double = instance_double("ActionMailer::MessageDelivery", deliver_later: nil)
-      allow(MergeCompletionMailer).to receive(:send_merged_organisation_success_mail).and_return(mail_double)
-      allow(MergeCompletionMailer).to receive(:send_absorbing_organisation_success_mail).and_return(mail_double)
+      mail_double = instance_double(ActionMailer::MessageDelivery, deliver_later: nil)
+      allow(MergeCompletionMailer).to receive_messages(send_merged_organisation_success_mail: mail_double, send_absorbing_organisation_success_mail: mail_double)
     end
 
     after do
@@ -51,7 +50,7 @@ RSpec.describe Merge::MergeOrganisationsService do
         merge_organisations_service.call
 
         absorbing_organisation.reload
-        expect(absorbing_organisation.holds_own_stock).to eq(true)
+        expect(absorbing_organisation.holds_own_stock).to be(true)
       end
 
       it "rolls back if there's an error" do
@@ -64,9 +63,9 @@ RSpec.describe Merge::MergeOrganisationsService do
 
         absorbing_organisation.reload
         merging_organisation.reload
-        expect(absorbing_organisation.holds_own_stock).to eq(false)
-        expect(merging_organisation.merge_date).to eq(nil)
-        expect(merging_organisation.absorbing_organisation_id).to eq(nil)
+        expect(absorbing_organisation.holds_own_stock).to be(false)
+        expect(merging_organisation.merge_date).to be_nil
+        expect(merging_organisation.absorbing_organisation_id).to be_nil
         expect(merging_organisation_user.organisation).to eq(merging_organisation)
       end
 
@@ -555,7 +554,7 @@ RSpec.describe Merge::MergeOrganisationsService do
             expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(absorbed_active_scheme)
             expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(absorbed_active_location)
             expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(absorbed_active_scheme)
-            expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to eq(nil)
+            expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to be_nil
           end
 
           it "rolls back if there's an error" do
@@ -879,7 +878,7 @@ RSpec.describe Merge::MergeOrganisationsService do
             expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(absorbing_organisation.owned_schemes.first)
             expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(absorbing_organisation.owned_schemes.first.locations.first)
             expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(absorbing_organisation.owned_schemes.first)
-            expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to eq(nil)
+            expect(absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to be_nil
           end
 
           it "rolls back if there's an error" do
@@ -999,7 +998,7 @@ RSpec.describe Merge::MergeOrganisationsService do
         merge_organisations_service.call
 
         absorbing_organisation.reload
-        expect(absorbing_organisation.holds_own_stock).to eq(true)
+        expect(absorbing_organisation.holds_own_stock).to be(true)
       end
 
       it "rolls back if there's an error" do
@@ -1012,9 +1011,9 @@ RSpec.describe Merge::MergeOrganisationsService do
 
         absorbing_organisation.reload
         merging_organisation.reload
-        expect(absorbing_organisation.holds_own_stock).to eq(false)
-        expect(merging_organisation.merge_date).to eq(nil)
-        expect(merging_organisation.absorbing_organisation_id).to eq(nil)
+        expect(absorbing_organisation.holds_own_stock).to be(false)
+        expect(merging_organisation.merge_date).to be_nil
+        expect(merging_organisation.absorbing_organisation_id).to be_nil
         expect(merging_organisation_user.organisation).to eq(merging_organisation)
       end
 
@@ -1196,7 +1195,7 @@ RSpec.describe Merge::MergeOrganisationsService do
         merge_organisations_service.call
 
         new_absorbing_organisation.reload
-        expect(new_absorbing_organisation.holds_own_stock).to eq(true)
+        expect(new_absorbing_organisation.holds_own_stock).to be(true)
       end
 
       it "rolls back if there's an error" do
@@ -1209,9 +1208,9 @@ RSpec.describe Merge::MergeOrganisationsService do
 
         new_absorbing_organisation.reload
         merging_organisation.reload
-        expect(new_absorbing_organisation.holds_own_stock).to eq(false)
-        expect(merging_organisation.merge_date).to eq(nil)
-        expect(merging_organisation.absorbing_organisation_id).to eq(nil)
+        expect(new_absorbing_organisation.holds_own_stock).to be(false)
+        expect(merging_organisation.merge_date).to be_nil
+        expect(merging_organisation.absorbing_organisation_id).to be_nil
         expect(merging_organisation_user.organisation).to eq(merging_organisation)
       end
 
@@ -1385,7 +1384,7 @@ RSpec.describe Merge::MergeOrganisationsService do
           expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(new_absorbing_organisation.owned_schemes.find_by(service_name: scheme.service_name))
           expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(new_absorbing_organisation.owned_schemes.find_by(service_name: scheme.service_name).locations.first)
           expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(new_absorbing_organisation.owned_schemes.find_by(service_name: scheme.service_name))
-          expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to eq(nil)
+          expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to be_nil
         end
 
         it "rolls back if there's an error" do
@@ -1605,7 +1604,7 @@ RSpec.describe Merge::MergeOrganisationsService do
             expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(new_absorbing_organisation_scheme)
             expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(new_absorbing_organisation_location)
             expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(new_absorbing_organisation_scheme)
-            expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to eq(nil)
+            expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to be_nil
           end
 
           it "rolls back if there's an error" do
@@ -1696,7 +1695,7 @@ RSpec.describe Merge::MergeOrganisationsService do
         merge_organisations_service.call
 
         new_absorbing_organisation.reload
-        expect(new_absorbing_organisation.holds_own_stock).to eq(true)
+        expect(new_absorbing_organisation.holds_own_stock).to be(true)
       end
 
       it "rolls back if there's an error" do
@@ -1709,9 +1708,9 @@ RSpec.describe Merge::MergeOrganisationsService do
 
         new_absorbing_organisation.reload
         merging_organisation.reload
-        expect(new_absorbing_organisation.holds_own_stock).to eq(false)
-        expect(merging_organisation.merge_date).to eq(nil)
-        expect(merging_organisation.absorbing_organisation_id).to eq(nil)
+        expect(new_absorbing_organisation.holds_own_stock).to be(false)
+        expect(merging_organisation.merge_date).to be_nil
+        expect(merging_organisation.absorbing_organisation_id).to be_nil
         expect(merging_organisation_user.organisation).to eq(merging_organisation)
       end
 
diff --git a/spec/services/storage/s3_service_spec.rb b/spec/services/storage/s3_service_spec.rb
index 907fdbdb9..cfb8cf129 100644
--- a/spec/services/storage/s3_service_spec.rb
+++ b/spec/services/storage/s3_service_spec.rb
@@ -7,9 +7,8 @@ RSpec.describe Storage::S3Service do
   let(:aws_credentials) { instance_double(Aws::ECSCredentials) }
 
   before do
-    allow(env_config_service).to receive(:s3_config_present?).and_return(true)
     allow(Aws::ECSCredentials).to receive(:new).and_return(aws_credentials)
-    allow(env_config_service).to receive(:s3_buckets).and_return({ "instance_1": { "credentials": {
+    allow(env_config_service).to receive_messages(s3_config_present?: true, s3_buckets: { "instance_1": { "credentials": {
       "aws_access_key_id": "key_id",
       "aws_region": "eu-west-2",
       "aws_secret_access_key": "secret",
diff --git a/spec/views/form/page_view_spec.rb b/spec/views/form/page_view_spec.rb
index 83f76572f..d5ad28743 100644
--- a/spec/views/form/page_view_spec.rb
+++ b/spec/views/form/page_view_spec.rb
@@ -101,7 +101,7 @@ RSpec.describe "form/page" do
   end
 
   context "with a question containing extra guidance" do
-    let(:expected_guidance) { /#{I18n.t("forms.2021.lettings.guidance.what_counts_as_income.content")}/ }
+    let(:expected_guidance) { /#{I18n.t('forms.2021.lettings.guidance.what_counts_as_income.content')}/ }
 
     context "with radio type" do
       let(:question_attributes) { { type: "radio", answer_options: { "1": "A", "2": "B" } } }
diff --git a/spec/views/logs/_create_for_org_actions.html.erb_spec.rb b/spec/views/logs/_create_for_org_actions.html.erb_spec.rb
index df448844d..a91ab4c77 100644
--- a/spec/views/logs/_create_for_org_actions.html.erb_spec.rb
+++ b/spec/views/logs/_create_for_org_actions.html.erb_spec.rb
@@ -2,8 +2,7 @@ require "rails_helper"
 
 RSpec.describe "logs/_create_for_org_actions.html.erb" do
   before do
-    allow(view).to receive(:current_user).and_return(user)
-    allow(view).to receive(:current_page?).and_return(true)
+    allow(view).to receive_messages(current_user: user, current_page?: true)
     assign(:organisation, user.organisation)
   end