Use only current and previous forms where needed

app/models/form.rb

@@ -20,7 +20,7 @@ class Form
         "end_date" => end_date,
         "sections" => sections,
       }
-      @unresolved_log_redirect_page_id = "tenancy_start_date"
+      @unresolved_log_redirect_page_id = "tenancy_start_date" if type == "lettings"
     else
       raise "No form definition file exists for given year".freeze unless File.exist?(form_path)
 

app/models/forms/bulk_upload_lettings/year.rb

@@ -34,7 +34,7 @@ module Forms
     private
 
       def possible_years
-        FormHandler.instance.lettings_forms.values.map { |form| form.start_date.year }.sort.reverse
+        [FormHandler.instance.lettings_forms["current_lettings"].start_date.year, FormHandler.instance.lettings_forms["previous_lettings"].start_date.year]
       end
     end
   end

app/models/validations/date_validations.rb

@@ -69,19 +69,19 @@ module Validations::DateValidations
 private
 
   def first_collection_start_date
-    @first_collection_start_date ||= FormHandler.instance.forms.map { |_name, form| form.start_date }.compact.min
+    @first_collection_start_date ||= FormHandler.instance.lettings_forms["previous_lettings"].start_date
   end
 
   def first_collection_end_date
-    @first_collection_end_date ||= FormHandler.instance.forms.map { |_name, form| form.end_date }.compact.min
+    @first_collection_end_date ||= FormHandler.instance.lettings_forms["previous_lettings"].end_date
   end
 
   def second_collection_start_date
-    @second_collection_start_date ||= FormHandler.instance.forms.map { |_name, form| form.start_date }.compact.max
+    @second_collection_start_date ||= FormHandler.instance.lettings_forms["current_lettings"].start_date
   end
 
   def second_collection_end_date
-    @second_collection_end_date ||= FormHandler.instance.forms.map { |_name, form| form.end_date }.compact.max
+    @second_collection_end_date ||= FormHandler.instance.lettings_forms["current_lettings"].end_date
   end
 
   def is_rsnvac_first_let?(record)

config/initializers/feature_toggle.rb

@@ -1,6 +1,6 @@
 class FeatureToggle
   def self.startdate_two_week_validation_enabled?
-    Rails.env.production?
+    Rails.env.production? || Rails.env.test?
   end
 
   def self.sales_log_enabled?