diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index 0c8ef3a12..ef73bdd7c 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -30,13 +30,13 @@ class CaseLogsController < ApplicationController
   end
 
   def edit
-    @form = use_form
+    @form = @@form_handler.get_form("2021_2022")
     @case_log = CaseLog.find(params[:id])
     render :edit
   end
 
   def submit_form
-    form = use_form
+    form = @@form_handler.get_form("2021_2022")
     @case_log = CaseLog.find(params[:id])
     previous_page = params[:case_log][:previous_page]
     questions_for_page = form.questions_for_page(previous_page)
@@ -52,14 +52,14 @@ class CaseLogsController < ApplicationController
   end
 
   def check_answers
-    form = use_form
+    form = @@form_handler.get_form("2021_2022")
     @case_log = CaseLog.find(params[:case_log_id])
     current_url = request.env["PATH_INFO"]
     subsection = current_url.split("/")[-2]
     render "form/check_answers", locals: { case_log: @case_log, subsection: subsection, form: form }
   end
 
-  form = ENV["RAILS_ENV"] == "test" ? @@form_handler.get_form("test_form") : @@form_handler.get_form("2021_2022")
+  form = @@form_handler.get_form("2021_2022")
   form.all_pages.map do |page_key, page_info|
     define_method(page_key) do |_errors = {}|
       @case_log = CaseLog.find(params[:case_log_id])
@@ -96,8 +96,4 @@ private
 
     params.require(:case_log).permit(CaseLog.editable_fields)
   end
-
-  def use_form
-    ENV["RAILS_ENV"] == "test" ? @@form_handler.get_form("test_form") : @@form_handler.get_form("2021_2022")
-  end
 end
diff --git a/app/models/form_handler.rb b/app/models/form_handler.rb
index b0de71250..3251e3371 100644
--- a/app/models/form_handler.rb
+++ b/app/models/form_handler.rb
@@ -7,7 +7,8 @@ class FormHandler
   end
 
   def get_form(form)
-    # binding.pry
+    return @forms["test_form"] ||= Form.new("test_form") if ENV["RAILS_ENV"] == "test"
+
     @forms[form] ||= Form.new(form)
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index 346fccff9..5a95075fd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,7 +6,7 @@ Rails.application.routes.draw do
   post "/case_logs/:id", to: "case_logs#submit_form"
 
   form_handler = FormHandler.instance
-  form = ENV["RAILS_ENV"] == "test" ? form_handler.get_form("test_form") : form_handler.get_form("2021_2022")
+  form = form_handler.get_form("2021_2022")
   resources :case_logs do
     form.all_pages.keys.map do |page|
       get page.to_s, to: "case_logs##{page}"