diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement.rb b/lib/smart_answer_flows/calculate-your-holiday-entitlement.rb
index 7f0abc362bd..da4b8204a60 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement.rb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement.rb
@@ -6,6 +6,8 @@ def define
       status :published
       satisfies_need "100143"
 
+      use_erb_templates_for_questions
+
       # Q1
       multiple_choice :basis_of_calculation? do
         option "days-worked-per-week"
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/annualised_hours.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/annualised_hours.govspeak.erb
new file mode 100644
index 00000000000..923eb071bf1
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/annualised_hours.govspeak.erb
@@ -0,0 +1,15 @@
+<% content_for :title do %>
+  How many hours will be worked a year?
+<% end %>
+
+<% content_for :hint do %>
+  This is calculated by excluding statutory entitlement. This calculation isn't suitable for term-time workers.
+<% end %>
+
+<% content_for :label do %>
+  Hours per year
+<% end %>
+
+<% content_for :error_message do %>
+  You need to enter a number greater than 0. Don't enter fractions. If you work half-hours, enter .5 for half. eg 340.5
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.govspeak.erb
new file mode 100644
index 00000000000..007b0607364
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.govspeak.erb
@@ -0,0 +1,16 @@
+<% content_for :title do %>
+  Is the holiday entitlement based on:
+<% end %>
+
+<% options(
+  "days-worked-per-week": "days worked per week",
+  "hours-worked-per-week": "hours worked per week",
+  "casual-or-irregular-hours": "casual or irregular hours",
+  "annualised-hours": "annualised hours",
+  "compressed-hours": "compressed hours",
+  "shift-worker": "shifts"
+) %>
+
+<% content_for :hint do %>
+  Check the employment contract if you’re not sure about the holiday entitlement.
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.govspeak.erb
new file mode 100644
index 00000000000..1826515dd82
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.govspeak.erb
@@ -0,0 +1,10 @@
+<% content_for :title do %>
+  Do you want to work out holiday:
+<% end %>
+
+<% options(
+  "full-year": "for a full leave year",
+  "starting": "for someone starting part way through a leave year",
+  "leaving": "for someone leaving part way through a leave year",
+  "starting-and-leaving": "for someone starting and leaving part way through a leave year"
+) %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/casual_or_irregular_hours.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/casual_or_irregular_hours.govspeak.erb
new file mode 100644
index 00000000000..662c47bd8a1
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/casual_or_irregular_hours.govspeak.erb
@@ -0,0 +1,15 @@
+<% content_for :title do %>
+  How many hours have been worked in this leave year?
+<% end %>
+
+<% content_for :hint do %>
+  The holiday entitlement may be calculated as the leave builds up ('accrues') for each hour worked.
+<% end %>
+
+<% content_for :label do %>
+  Hours worked
+<% end %>
+
+<% content_for :error_message do %>
+  You need to enter a number greater than 0. Don't enter fractions. If you work half-hours, enter .5 for half. eg 340.5
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.govspeak.erb
new file mode 100644
index 00000000000..7b64013301a
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.govspeak.erb
@@ -0,0 +1,11 @@
+<% content_for :title do %>
+  Number of days per week worked?
+<% end %>
+
+<% content_for :label do %>
+  Days per week
+<% end %>
+
+<% content_for :error_message do %>
+  Please check and enter a correct value. Don't enter fractions. If you work half-days, enter .5 for half. eg 4.5
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.govspeak.erb
new file mode 100644
index 00000000000..89d023032b3
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.govspeak.erb
@@ -0,0 +1,11 @@
+<% content_for :title do %>
+  How many hours are worked per week?
+<% end %>
+
+<% content_for :label do %>
+  Hours per week
+<% end %>
+
+<% content_for :error_message do %>
+  You can enter a maximum of 168 hours per week. Don't enter fractions. If you work half-hours, enter .5 for half. eg 40.5
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.govspeak.erb
new file mode 100644
index 00000000000..eb30b79e4c3
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.govspeak.erb
@@ -0,0 +1,11 @@
+<% content_for :title do %>
+  Number of days worked per week?
+<% end %>
+
+<% content_for :hint do %>
+  If you work half-days enter .5 for a half, eg 3.5 for three and a half days.
+<% end %>
+
+<% content_for :error_message do %>
+  Please check and enter a correct value. Don't enter fractions. If you work half-days, enter .5 for half. eg 4.5
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.govspeak.erb
new file mode 100644
index 00000000000..445a3729fde
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.govspeak.erb
@@ -0,0 +1,11 @@
+<% content_for :title do %>
+  Number of hours worked per week?
+<% end %>
+
+<% content_for :hint do %>
+  If you work half-hours enter .5 for a half, eg 40.5.
+<% end %>
+
+<% content_for :error_message do %>
+  You can enter a maximum of 168 hours per week. Don't enter fractions. If you work half-hours, enter .5 for half. eg 40.5
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.govspeak.erb
new file mode 100644
index 00000000000..57e082b2533
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.govspeak.erb
@@ -0,0 +1,10 @@
+<% content_for :title do %>
+  Do you want to calculate the holiday:
+<% end %>
+
+<% options(
+  "full-year": "for a full leave year",
+  "starting": "for someone starting part way through a leave year",
+  "leaving": "for someone leaving part way through a leave year",
+  "starting-and-leaving": "for someone starting and leaving part way through a leave year"
+) %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.govspeak.erb
new file mode 100644
index 00000000000..f4f6ec8adaf
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.govspeak.erb
@@ -0,0 +1,15 @@
+<% content_for :title do %>
+  How many days in the shift pattern?
+<% end %>
+
+<% content_for :hint do %>
+  The shift pattern includes non-working days.
+<% end %>
+
+<% content_for :label do %>
+  Days per pattern
+<% end %>
+
+<% content_for :error_message do %>
+  You need to enter a number greater than or equal to the number of shifts you work. Don't enter fractions. If you work half-days, enter .5 for half. eg 4.5
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.govspeak.erb
new file mode 100644
index 00000000000..14d7512e0ea
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.govspeak.erb
@@ -0,0 +1,11 @@
+<% content_for :title do %>
+  How many hours in each shift?
+<% end %>
+
+<% content_for :label do %>
+  Hours per shift
+<% end %>
+
+<% content_for :error_message do %>
+  You need to enter a number greater than 0. Don't enter fractions. If you work half-hours, enter .5 for half. eg 4.5
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.govspeak.erb
new file mode 100644
index 00000000000..7325d369fd1
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.govspeak.erb
@@ -0,0 +1,11 @@
+<% content_for :title do %>
+  How many shifts will be worked per shift pattern?
+<% end %>
+
+<% content_for :label do %>
+  Shifts per pattern
+<% end %>
+
+<% content_for :error_message do %>
+  You need to enter a number greater than 0
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.govspeak.erb
new file mode 100644
index 00000000000..084d7b0ef6d
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.govspeak.erb
@@ -0,0 +1,3 @@
+<% content_for :title do %>
+  What was the employment end date?
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.govspeak.erb
new file mode 100644
index 00000000000..1b47018d449
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.govspeak.erb
@@ -0,0 +1,3 @@
+<% content_for :title do %>
+  What was the employment start date?
+<% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.govspeak.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.govspeak.erb
new file mode 100644
index 00000000000..f5cf83c2d49
--- /dev/null
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.govspeak.erb
@@ -0,0 +1,7 @@
+<% content_for :title do %>
+  When does the leave year start?
+<% end %>
+
+<% content_for :hint do %>
+  This is usually in the employment contract. If it isn’t and the job was started after 1 October 1998, the leave year will start on the 1st day of the job. If the job was started on or before 1 October 1998, the leave year will start on 1 October.
+<% end %>
diff --git a/lib/smart_answer_flows/locales/en/calculate-your-holiday-entitlement.yml b/lib/smart_answer_flows/locales/en/calculate-your-holiday-entitlement.yml
deleted file mode 100644
index 0e4972a1abb..00000000000
--- a/lib/smart_answer_flows/locales/en/calculate-your-holiday-entitlement.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-en-GB:
-  flow:
-    calculate-your-holiday-entitlement:
-      phrases:
-
-        your_employer: |
-          The employer:
-
-          * can include public and bank holidays as part of the statutory entitlement
-          * can give more paid holiday - this will be in the employment contract and is called 'contractual leave entitlement'
-          * must provide [holiday pay](/holiday-entitlement-rights/holiday-pay-the-basics "Holiday pay") during the statutory leave
-
-      # Q1
-      basis_of_calculation?:
-        title: "Is the holiday entitlement based on:"
-        hint: |
-          Check the employment contract if you’re not sure about the holiday entitlement.
-        options:
-          "days-worked-per-week": "days worked per week"
-          "hours-worked-per-week": "hours worked per week"
-          "casual-or-irregular-hours": "casual or irregular hours"
-          "annualised-hours": "annualised hours"
-          "compressed-hours": "compressed hours"
-          "shift-worker": "shifts"
-
-      # Q2
-      calculation_period?:
-        title: "Do you want to work out holiday:"
-        options:
-          "full-year": "for a full leave year"
-          "starting": "for someone starting part way through a leave year"
-          "leaving": "for someone leaving part way through a leave year"
-          "starting-and-leaving": "for someone starting and leaving part way through a leave year"
-
-      # Q3
-      how_many_days_per_week?:
-        title: Number of days worked per week?
-        hint: If you work half-days enter .5 for a half, eg 3.5 for three and a half days.
-        error_message: Please check and enter a correct value. Don't enter fractions. If you work half-days, enter .5 for half. eg 4.5
-      # Q4
-      what_is_your_starting_date?:
-        title: What was the employment start date?
-      # Q5
-      what_is_your_leaving_date?:
-        title: What was the employment end date?
-
-      how_many_hours_per_week?:
-        title: Number of hours worked per week?
-        hint: If you work half-hours enter .5 for a half, eg 40.5.
-        error_message: You can enter a maximum of 168 hours per week. Don't enter fractions. If you work half-hours, enter .5 for half. eg 40.5
-
-      # Q13
-      compressed_hours_how_many_hours_per_week?:
-        title: How many hours are worked per week?
-        label: Hours per week
-        error_message: You can enter a maximum of 168 hours per week. Don't enter fractions. If you work half-hours, enter .5 for half. eg 40.5
-
-      compressed_hours_how_many_days_per_week?:
-        title: Number of days per week worked?
-        label: Days per week
-        error_message: Please check and enter a correct value. Don't enter fractions. If you work half-days, enter .5 for half. eg 4.5
-
-      # Q11
-      casual_or_irregular_hours?:
-        title: How many hours have been worked in this leave year?
-        hint: The holiday entitlement may be calculated as the leave builds up ('accrues') for each hour worked.
-        label: Hours worked
-        error_message: You need to enter a number greater than 0. Don't enter fractions. If you work half-hours, enter .5 for half. eg 340.5
-
-      annualised_hours?:
-        title: How many hours will be worked a year?
-        hint: This is calculated by excluding statutory entitlement. This calculation isn't suitable for term-time workers.
-        label: Hours per year
-        error_message: You need to enter a number greater than 0. Don't enter fractions. If you work half-hours, enter .5 for half. eg 340.5
-
-      # Q15
-      shift_worker_basis?:
-        title: "Do you want to calculate the holiday:"
-        options:
-          "full-year": "for a full leave year"
-          "starting": "for someone starting part way through a leave year"
-          "leaving": "for someone leaving part way through a leave year"
-          "starting-and-leaving": "for someone starting and leaving part way through a leave year"
-
-      shift_worker_hours_per_shift?:
-        title: How many hours in each shift?
-        label: Hours per shift
-        error_message: You need to enter a number greater than 0. Don't enter fractions. If you work half-hours, enter .5 for half. eg 4.5
-
-      shift_worker_shifts_per_shift_pattern?:
-        title: How many shifts will be worked per shift pattern?
-        label: Shifts per pattern
-        error_message: You need to enter a number greater than 0
-
-      # Q20
-      shift_worker_days_per_shift_pattern?:
-        title: How many days in the shift pattern?
-        hint: The shift pattern includes non-working days.
-        label: Days per pattern
-        error_message: You need to enter a number greater than or equal to the number of shifts you work. Don't enter fractions. If you work half-days, enter .5 for half. eg 4.5
-
-      when_does_your_leave_year_start?:
-        title: When does the leave year start?
-        hint: This is usually in the employment contract. If it isn’t and the job was started after 1 October 1998, the leave year will start on the 1st day of the job. If the job was started on or before 1 October 1998, the leave year will start on 1 October.
diff --git a/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.html b/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.html
index dc85e36b28c..a0788c7c537 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.html
@@ -37,7 +37,8 @@ <h2>
   <div class="question-body">
     
 
-      <p class="hint">This is calculated by excluding statutory entitlement. This calculation isn&#39;t suitable for term-time workers.</p>
+
+      <p class="hint">This is calculated by excluding statutory entitlement. This calculation isn't suitable for term-time workers.</p>
 
     <div class="">
 
@@ -45,6 +46,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.html b/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.html
index 9be8fdff0d7..b408f3432d7 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.html
@@ -37,7 +37,8 @@ <h2>
   <div class="question-body">
     
 
-      <p class="hint">The holiday entitlement may be calculated as the leave builds up (&#39;accrues&#39;) for each hour worked.</p>
+
+      <p class="hint">The holiday entitlement may be calculated as the leave builds up ('accrues') for each hour worked.</p>
 
     <div class="">
 
@@ -45,6 +46,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.html b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.html
index b9e2a736de6..437dc8c1f52 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.html
@@ -38,12 +38,14 @@ <h2>
     
 
 
+
     <div class="">
 
       <label for="response">Hours per week<input type="text" name="response" id="response" /></label>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.html b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.html
index c7082ce0c3c..0a4bdf4661b 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.html
@@ -38,12 +38,14 @@ <h2>
     
 
 
+
     <div class="">
 
       <label for="response">Days per week<input type="text" name="response" id="response" /></label>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.html
index 4b102f2d5b7..325867403fc 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.html
@@ -38,6 +38,7 @@ <h2>
     
 
 
+
     <div class="">
 
       <ul class="options">
@@ -69,6 +70,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.html
index 38d8368ffbc..1b66e726d8a 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.html
@@ -37,6 +37,7 @@ <h2>
   <div class="question-body">
     
 
+
       <p class="hint">If you work half-days enter .5 for a half, eg 3.5 for three and a half days.</p>
 
     <div class="">
@@ -45,6 +46,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.html
index 7faeb0b69bc..3fe90cd5e0a 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.html
@@ -38,6 +38,7 @@ <h2>
     
 
 
+
     <div class="">
 
       <fieldset>
@@ -109,6 +110,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.html
index 0e1ae4a05e4..690a165d280 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.html
@@ -38,6 +38,7 @@ <h2>
     
 
 
+
     <div class="">
 
       <fieldset>
@@ -109,6 +110,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.html
index 44172b498ca..67114862d46 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.html
@@ -37,6 +37,7 @@ <h2>
   <div class="question-body">
     
 
+
       <p class="hint">This is usually in the employment contract. If it isn’t and the job was started after 1 October 1998, the leave year will start on the 1st day of the job. If the job was started on or before 1 October 1998, the leave year will start on 1 October.</p>
 
     <div class="">
@@ -110,6 +111,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.html b/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.html
index 405a2cff19c..e7ebfcd9fe6 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.html
@@ -37,6 +37,7 @@ <h2>
   <div class="question-body">
     
 
+
       <p class="hint">If you work half-hours enter .5 for a half, eg 40.5.</p>
 
     <div class="">
@@ -45,6 +46,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker.html b/test/artefacts/calculate-your-holiday-entitlement/shift-worker.html
index c161302351a..8469227da66 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/shift-worker.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/shift-worker.html
@@ -38,6 +38,7 @@ <h2>
     
 
 
+
     <div class="">
 
       <ul class="options">
@@ -69,6 +70,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.html b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.html
index ad04b3108e6..fed41938449 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.html
@@ -38,12 +38,14 @@ <h2>
     
 
 
+
     <div class="">
 
       <label for="response">Hours per shift<input type="text" name="response" id="response" /></label>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.html b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.html
index afc781e1ffc..5a4f407255f 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.html
@@ -37,6 +37,7 @@ <h2>
   <div class="question-body">
     
 
+
       <p class="hint">The shift pattern includes non-working days.</p>
 
     <div class="">
@@ -45,6 +46,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.html b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.html
index 8f27631ba4b..3feb1cf2d7c 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.html
@@ -38,12 +38,14 @@ <h2>
     
 
 
+
     <div class="">
 
       <label for="response">Shifts per pattern<input type="text" name="response" id="response" /></label>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/y.html b/test/artefacts/calculate-your-holiday-entitlement/y.html
index 9df5b1143de..0ac1859c6e7 100644
--- a/test/artefacts/calculate-your-holiday-entitlement/y.html
+++ b/test/artefacts/calculate-your-holiday-entitlement/y.html
@@ -37,8 +37,8 @@ <h2>
   <div class="question-body">
     
 
-      <p class="hint">Check the employment contract if you’re not sure about the holiday entitlement.
-</p>
+
+      <p class="hint">Check the employment contract if you’re not sure about the holiday entitlement.</p>
 
     <div class="">
 
@@ -83,6 +83,7 @@ <h2>
 
 
       
+
     </div>
   </div>
 </div>
diff --git a/test/data/calculate-your-holiday-entitlement-files.yml b/test/data/calculate-your-holiday-entitlement-files.yml
index 964ef2c1936..936b72078f0 100644
--- a/test/data/calculate-your-holiday-entitlement-files.yml
+++ b/test/data/calculate-your-holiday-entitlement-files.yml
@@ -1,6 +1,5 @@
 ---
-lib/smart_answer_flows/calculate-your-holiday-entitlement.rb: ea477752bd44c3f1cfa092a7f0d8d891
-lib/smart_answer_flows/locales/en/calculate-your-holiday-entitlement.yml: 0e0af2f45c9cca757b9d5fcb6fd3cc6d
+lib/smart_answer_flows/calculate-your-holiday-entitlement.rb: 0ed1c1c55b7cc0a9f89054cd2e43f3e2
 test/data/calculate-your-holiday-entitlement-questions-and-responses.yml: a5d687911e6173e74f2b70af6a5ff7bd
 test/data/calculate-your-holiday-entitlement-responses-and-expected-results.yml: 5ff2290223d8188d45a84cde9883acf6
 lib/smart_answer_flows/calculate-your-holiday-entitlement/calculate_your_holiday_entitlement.govspeak.erb: 76f569916a2429d42e52afc658285f6a
@@ -11,4 +10,19 @@ lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/compressed_ho
 lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/days_per_week_done.govspeak.erb: 30bd1611f5d7f82ac201081d85bbf2fc
 lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/hours_per_week_done.govspeak.erb: 49beabeab25baddb8b42b02eebaca12a
 lib/smart_answer_flows/calculate-your-holiday-entitlement/outcomes/shift_worker_done.govspeak.erb: 58a7a83fc28b048485a3fce1cdda59d2
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/annualised_hours.govspeak.erb: 9512159d41686b448a7c8615f1c30129
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.govspeak.erb: abce1b150f1249d25d80ac21ef65add7
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.govspeak.erb: 4e7d5d3a73d64d967ac2b2fee414a125
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/casual_or_irregular_hours.govspeak.erb: 7cc48ca9b462ab65c4316877ec93e7d2
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.govspeak.erb: 1034869fadddea66fb01e2299cde7f70
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.govspeak.erb: 4699acf188a353d06ebc8870adc1b680
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.govspeak.erb: e0a052bea6be21ba5e97b3a865de893e
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.govspeak.erb: f02849bc56b12f8a726f621d3127f393
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.govspeak.erb: e9bc2ae3ebf1cd0c9baf24a393b6a979
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.govspeak.erb: b836c623c1238365c81f20cfbc23ad64
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.govspeak.erb: 518cd38a873fa195eb1e9de5e9900929
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.govspeak.erb: 95b0fcc672e23cf0c086f5defb881896
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.govspeak.erb: f5356b35f0d139db060a2092618a99d7
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.govspeak.erb: d2c6ff5f114bb913455c4db4d4153f9b
+lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.govspeak.erb: 91de5a5baac16d04d4d0ddc4a5002b96
 lib/smart_answer/calculators/holiday_entitlement.rb: 2e642f3d02f3f4a3defa2c618c5f8289