Additional fixes

spec/helpers/filters_helper_spec.rb

@@ -168,7 +168,7 @@ RSpec.describe FiltersHelper do
 
     before do
       FactoryBot.create(:organisation_relationship, parent_organisation:, child_organisation:)
-      FactoryBot.create(:organisation, name: "Other organisation", id: 99)
+      FactoryBot.create(:organisation, name: "Other organisation", id: 9_999_999)
       user.organisation.reload
     end
 
@@ -326,7 +326,7 @@ RSpec.describe FiltersHelper do
 
     before do
       FactoryBot.create(:organisation_relationship, parent_organisation:, child_organisation:)
-      FactoryBot.create(:organisation, name: "Other organisation", id: 99)
+      FactoryBot.create(:organisation, name: "Other organisation", id: 9_999_999)
       user.organisation.reload
     end
 

spec/services/csv/scheme_csv_service_spec.rb

@@ -13,12 +13,14 @@ RSpec.describe Csv::SchemeCsvService do
 
   before do
     Timecop.freeze(fixed_time)
+    Singleton.__init__(FormHandler)
     create(:scheme_deactivation_period, scheme:, deactivation_date: scheme.created_at + 1.year, reactivation_date: scheme.created_at + 2.years)
     create(:location_deactivation_period, location:, deactivation_date: location.created_at + 6.months)
   end
 
   after do
     Timecop.return
+    Singleton.__init__(FormHandler)
   end
 
   it "returns a string" do