diff --git a/lib/smart_answer/calculators/minimum_wage_calculator.rb b/lib/smart_answer/calculators/minimum_wage_calculator.rb
index 67b36ad3c8d..8e5f0b27a11 100644
--- a/lib/smart_answer/calculators/minimum_wage_calculator.rb
+++ b/lib/smart_answer/calculators/minimum_wage_calculator.rb
@@ -4,14 +4,13 @@ class MinimumWageCalculator
     attr_accessor :age, :pay_frequency, :basic_hours, :basic_pay, :is_apprentice,
       :overtime_hours, :overtime_hourly_rate, :accommodation_cost
 
-    attr_reader :date, :what_to_check
+    attr_reader :date
 
     def initialize(params = {})
       @age = params[:age]
       @date = (params[:date].nil? ? Date.today : params[:date])
       @basic_hours = params[:basic_hours].to_f
       @basic_pay = params[:basic_pay].to_f
-      @what_to_check = params[:what_to_check]
       @is_apprentice = params[:is_apprentice]
       @pay_frequency = params[:pay_frequency] || 7
       @overtime_hours = params[:overtime_hours].to_i || 0
@@ -74,7 +73,11 @@ def minimum_hourly_rate
       if @is_apprentice
         @minimum_wage_data[:apprentice_rate]
       else
-        per_hour_minimum_wage
+        if eligible_for_living_wage?
+          national_living_wage_rate
+        else
+          per_hour_minimum_wage
+        end
       end
     end
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage.rb b/lib/smart_answer_flows/am-i-getting-minimum-wage.rb
index 61a2d822a81..7b454766975 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage.rb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage.rb
@@ -10,10 +10,9 @@ def define
       multiple_choice :what_would_you_like_to_check? do
         option "current_payment"
         option "past_payment"
-        option "current_payment_april_2016"
 
-        calculate :calculator do |response|
-          Calculators::MinimumWageCalculator.new(what_to_check: response)
+        calculate :calculator do
+          Calculators::MinimumWageCalculator.new
         end
 
         calculate :accommodation_charge do
@@ -24,52 +23,22 @@ def define
           case response
           when 'current_payment'
             question :are_you_an_apprentice?
-          when 'current_payment_april_2016'
-            question :will_you_be_a_first_year_apprentice?
           when 'past_payment'
             question :past_payment_date?
           end
         end
       end
 
-      # Q2 - April 2016
-      multiple_choice :will_you_be_a_first_year_apprentice? do
-        option :yes
-        option :no
-
-        next_node do |response|
-          case response
-          when 'yes'
-            calculator.is_apprentice = true
-            outcome :does_not_apply_to_first_year_apprentices
-          when 'no'
-            question :how_old_are_you? #Q3
-          end
-        end
-      end
-
       # Q3
       value_question :how_old_are_you?, parse: Integer do
         precalculate :age_title do
-          if calculator.what_to_check == 'current_payment_april_2016'
-            "How old will you be on 1 April 2016?"
-          else
-            "How old are you?"
-          end
+          "How old are you?"
         end
 
         validate do |response|
           calculator.valid_age?(response)
         end
 
-        validate :valid_age_for_living_wage? do |response|
-          if calculator.what_to_check == 'current_payment_april_2016'
-            calculator.valid_age_for_living_wage?(response)
-          else
-            true
-          end
-        end
-
         next_node do |response|
           calculator.age = response
           if calculator.under_school_leaving_age?
@@ -81,8 +50,6 @@ def define
       end
 
       use_shared_logic "minimum_wage"
-
-      outcome :does_not_apply_to_first_year_apprentices
     end
   end
 end
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb
index ece9b60f421..4dbb1a5635b 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb
@@ -1,15 +1,17 @@
 <% content_for :title do %>
-  National Minimum Wage calculator for workers
+  Minimum wage calculator for workers
 <% end %>
 
 <% content_for :meta_description do %>
-  Check if your pay matches the National Minimum Wage, the national living wage or if your employer owes you payments from past years.
+  Check if your pay matches the National Minimum Wage, the National Living Wage or if your employer owes you payments from past years.
 <% end %>
 
 <% content_for :body do %>
-  Check if your pay matches the National Minimum Wage or if your employer owes you payments from past years.
+    Check if:
 
-  You can also check if you'll get the national living wage from 1 April 2016.
+    - you’re getting paid the National Minimum Wage
+    - you’re getting paid the National Living Wage
+    - your employer owes you past payments from past years
 
-  ^You must be at least 25 years old to get the national living wage.^
+  ^You must be at least 25 years old to get the National Living Wage.^
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb
index 69fed1cabf0..cd2fb287a18 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb
@@ -1,25 +1,19 @@
 <% content_for :body do %>
   $C
-  <% if calculator.what_to_check == 'current_payment_april_2016' && calculator.eligible_for_living_wage? %>
-    <% if calculator.living_wage_or_above? %>
-      You will be getting the national living wage
-    <% else %>
-      You are getting the National Minimum wage but your pay should be increased to at least the national living wage from 1 April 2016.
-    <% end %>
+  <% if calculator.eligible_for_living_wage? %>
+    You are getting the National Living Wage.
   <% else %>
     You are getting the National Minimum Wage.
   <% end %>
   $C
 
-  <% if calculator.what_to_check == 'current_payment_april_2016' && calculator.eligible_for_living_wage? %>
-    The national living wage per hour for your age will be | Your actual pay
-  <% else %>
-    The National Minimum Wage per hour for your age | Your actual pay
-  <% end %>
+  <% if calculator.eligible_for_living_wage? %>
+    The National Living Wage per hour for your age | Your actual pay
     - | -
-  <% if calculator.what_to_check == 'current_payment_april_2016' && calculator.eligible_for_living_wage? %>
     <%= format_money(calculator.national_living_wage_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
   <% else %>
+    The National Minimum Wage per hour for your age | Your actual pay
+    - | -
     <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
   <% end %>
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb
index c232a446965..8407494ddcd 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb
@@ -1,16 +1,24 @@
 <% content_for :body do %>
   $C
-  You aren't getting the National Minimum Wage.
+  <% if calculator.eligible_for_living_wage? %>
+    You aren't getting the National Living Wage.
+  <% else %>
+    You aren't getting the National Minimum Wage.
+  <% end %>
   $C
 
-  The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
-  - | - | -
-  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.total_underpayment) %>
+  <% if calculator.eligible_for_living_wage? %>
+    The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+    - | - | -
+    <%= format_money(calculator.national_living_wage_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.total_underpayment) %>
+  <% else %>
+    The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+    - | - | -
+    <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.total_underpayment) %>
+  <% end %>
 
   \* This figure has been rounded to the nearest penny.
 
-  ^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
   If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
   <%= render partial: 'shared/minimum_wage/acas_information.govspeak.erb' %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/does_not_apply_to_first_year_apprentices.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/does_not_apply_to_first_year_apprentices.govspeak.erb
deleted file mode 100644
index c925cb06b0b..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/does_not_apply_to_first_year_apprentices.govspeak.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% content_for :body do %>
-  You won't get the national living wage as a first year apprentice.
-
-  You'll only get the [National Minimum Wage for an apprentice.](/apprenticeships-guide/pay-and-conditions)
-<% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.govspeak.erb
index 87f03a3d5bf..ec4bdb337a4 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.govspeak.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.govspeak.erb
@@ -10,5 +10,5 @@
   Please enter a whole number greater than 0
 <% end %>
 <% content_for :valid_age_for_living_wage? do %>
-  You must be 25 or over to get the national living wage
+  You must be 25 or over to get the National Living Wage
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.govspeak.erb
index ffd7096a56f..ccb592567a6 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.govspeak.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.govspeak.erb
@@ -3,7 +3,6 @@
 <% end %>
 
 <% options(
-  "current_payment": "If you're getting the National Minimum Wage (from October 2015)",
-  "past_payment": "If an employer owes you past payments (before October 2015)",
-  "current_payment_april_2016": "If you'll get the national living wage (from 1 April 2016)"
+  "current_payment": "If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)",
+  "past_payment": "If an employer owes you past payments (before October 2015)"
 ) %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/will_you_be_a_first_year_apprentice.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/will_you_be_a_first_year_apprentice.govspeak.erb
deleted file mode 100644
index 09e3ed51b06..00000000000
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/will_you_be_a_first_year_apprentice.govspeak.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% content_for :title do %>
-  Will you be in the first year of an apprenticeship on 1 April 2016?
-<% end %>
-
-<% options(
-  "no": "No",
-  "yes": "Yes"
-) %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers.rb b/lib/smart_answer_flows/minimum-wage-calculator-employers.rb
index 3a70e2f7247..fd8e6532d27 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers.rb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers.rb
@@ -11,8 +11,8 @@ def define
         option "current_payment"
         option "past_payment"
 
-        calculate :calculator do |response|
-          Calculators::MinimumWageCalculator.new(what_to_check: response)
+        calculate :calculator do
+          Calculators::MinimumWageCalculator.new
         end
 
         calculate :accommodation_charge do
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.govspeak.erb
index d56d6e1d7e6..ff8902758fc 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.govspeak.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.govspeak.erb
@@ -1,11 +1,17 @@
 <% content_for :title do %>
-  National Minimum Wage calculator for employers
+  Minimum wage calculator for employers
 <% end %>
 
 <% content_for :meta_description do %>
-  Check if you're paying a worker the National Minimum Wage or if you owe them payments from past years.
+  Check if you’re paying a worker the National Minimum Wage, the National Living Wage or if you owe them payments for past years.
 <% end %>
 
 <% content_for :body do %>
-  Check if you're paying a worker the National Minimum Wage or if you owe them payments from past years.
+  Check if:
+
+  - you’re paying a worker the National Minimum Wage
+  - you’re paying a worker the National Living Wage
+  - you owe your employee payments from previous years
+
+  ^Your employee must be at least 25 years old to get the national living wage.^
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.govspeak.erb
index 7f748d397a1..f7104a1b333 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.govspeak.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.govspeak.erb
@@ -1,11 +1,22 @@
 <% content_for :body do %>
   $C
-  You are paying the National Minimum Wage.
+  <% if calculator.eligible_for_living_wage? %>
+    You are paying the National Living Wage.
+  <% else %>
+    You are paying the National Minimum Wage.
+  <% end %>
   $C
 
-  The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
-  - | -
-  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
+  <% if calculator.eligible_for_living_wage? %>
+    The National Living Wage per hour for the worker’s age | The worker’s actual pay
+    - | -
+    <%= format_money(calculator.national_living_wage_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
+  <% else %>
+    The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+    - | -
+    <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
+  <% end %>
+
 
   If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.govspeak.erb
index 46ef78bb871..525daca1c5f 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.govspeak.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.govspeak.erb
@@ -1,11 +1,22 @@
 <% content_for :body do %>
   $C
-  You aren't paying the National Minimum Wage.
+  <% if calculator.eligible_for_living_wage? %>
+    You aren't paying the National Living Wage.
+  <% else %>
+    You aren't paying the National Minimum Wage.
+  <% end %>
   $C
 
-  The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
-  - | - | -
-  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.total_underpayment) %>
+  <% if calculator.eligible_for_living_wage? %>
+    The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+    - | - | -
+    <%= format_money(calculator.national_living_wage_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.total_underpayment) %>
+  <% else %>
+    The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+    - | - | -
+    <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.total_underpayment) %>
+  <% end %>
+
 
   \* This figure has been rounded to the nearest penny.
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.govspeak.erb
index ed36b57dae5..21ca55af7c2 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.govspeak.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.govspeak.erb
@@ -3,6 +3,6 @@
 <% end %>
 
 <% options(
-  "current_payment": "If you’re paying a worker the National Wage (from October 2015)",
+  "current_payment": "If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)",
   "past_payment": "If you owe a worker past payments (before October 2015)"
 ) %>
diff --git a/test/artefacts/am-i-getting-minimum-wage/am-i-getting-minimum-wage.txt b/test/artefacts/am-i-getting-minimum-wage/am-i-getting-minimum-wage.txt
index b5efeed395c..0e3c9a6aadd 100644
--- a/test/artefacts/am-i-getting-minimum-wage/am-i-getting-minimum-wage.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/am-i-getting-minimum-wage.txt
@@ -1,10 +1,12 @@
-National Minimum Wage calculator for workers
+Minimum wage calculator for workers
 
-Check if your pay matches the National Minimum Wage or if your employer owes you payments from past years.
+Check if:
 
-You can also check if you'll get the national living wage from 1 April 2016.
+- you’re getting paid the National Minimum Wage
+- you’re getting paid the National Living Wage
+- your employer owes you past payments from past years
 
-^You must be at least 25 years old to get the national living wage.^
+^You must be at least 25 years old to get the National Living Wage.^
 
 
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment.html b/test/artefacts/am-i-getting-minimum-wage/current_payment.html
index 4a59cd5621a..4286eaf8f6c 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
@@ -93,7 +93,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 0278e79d273..748c4a24737 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index d4b9e54c089..4f0c9ee41ed 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 964ff8d8a45..cee706288af 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 49d9a724025..ce3ea516388 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_first_year/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/no.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/no.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/no.txt
index b3800def703..a0218d8979e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/no.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index b3800def703..a0218d8979e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 74da26a701a..cf61b296958 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/yes_free/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/yes_free/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/yes_free/5.txt
index 321e938a963..0b18b537c29 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/0.0/yes_free/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/no.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/no.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/no.txt
index 76825433b61..9774d54e545 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/no.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 76825433b61..9774d54e545 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 5ea638790c0..fbe8eb66609 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/yes_free/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index d90e24906bc..1c4fa791775 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/no.txt
similarity index 79%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/no.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/no.txt
index b0064ff2b9f..1a2eb69ac9f 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You will be getting the national living wage
+You are getting the National Minimum Wage.
 $C
 
-The national living wage per hour for your age will be | Your actual pay
+The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£7.20 | £10
+£6.50 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
similarity index 79%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index b0064ff2b9f..1a2eb69ac9f 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You will be getting the national living wage
+You are getting the National Minimum Wage.
 $C
 
-The national living wage per hour for your age will be | Your actual pay
+The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£7.20 | £10
+£6.50 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
similarity index 79%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index b0064ff2b9f..d34a2a29835 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You will be getting the national living wage
+You are getting the National Minimum Wage.
 $C
 
-The national living wage per hour for your age will be | Your actual pay
+The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£7.20 | £10
+£6.50 | £16.74
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/yes_free/5.txt
new file mode 100644
index 00000000000..1ee25dd21c3
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/0.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £18.98
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/no.txt
similarity index 79%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/no.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/no.txt
index b0064ff2b9f..c68f0abdbca 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You will be getting the national living wage
+You are getting the National Minimum Wage.
 $C
 
-The national living wage per hour for your age will be | Your actual pay
+The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£7.20 | £10
+£6.50 | £10
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..c68f0abdbca
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
new file mode 100644
index 00000000000..a3f043d095f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £8.66
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/yes_free/5.txt
new file mode 100644
index 00000000000..cac558c1b02
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10.15
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/no.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/no.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/no.txt
index b3800def703..a0218d8979e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/no.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index b3800def703..a0218d8979e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index d23d9e5b0c2..35c54c3c121 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/yes_free/5.txt
new file mode 100644
index 00000000000..da4d1075f5d
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/0.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £13.28
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/no.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/no.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/no.txt
index 76825433b61..9774d54e545 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/no.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 76825433b61..9774d54e545 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 05dd6e3c1ad..1655ed5207a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/yes_free/5.txt
new file mode 100644
index 00000000000..8b63e80ff2d
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10.94
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/no.txt
new file mode 100644
index 00000000000..1a2eb69ac9f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/no.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £18.75
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..1a2eb69ac9f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £18.75
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index ef9da1b5dc1..f6f70f2555f 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/yes_free/5.txt
new file mode 100644
index 00000000000..52f1853a629
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/0.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £25.78
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/no.txt
new file mode 100644
index 00000000000..c68f0abdbca
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/no.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..c68f0abdbca
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
similarity index 90%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index d4d23b145b9..adc885c5a7a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/yes_free/5.txt
new file mode 100644
index 00000000000..d7d6a4abe6d
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/24/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £14.69
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/no.txt
index b3800def703..dbaab0a72bf 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/no.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index b3800def703..dbaab0a72bf 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 74da26a701a..6dbf560f460 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £4.24 * | £36.12
+£7.20 | £4.24 * | £47.32
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_free/5.txt
index 321e938a963..aec61ad9a63 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.48 * | £0.37
+£7.20 | £6.48 * | £11.57
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/no.txt
index 76825433b61..550e9dfcdab 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 76825433b61..550e9dfcdab 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 5ea638790c0..e9a528c0006 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £4.91 * | £38.12
+£7.20 | £4.91 * | £54.92
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index d90e24906bc..20cb45daaf2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.40 * | £2.37
+£7.20 | £6.40 * | £19.17
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/no.txt
index 1a2eb69ac9f..348605fd6b2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 1a2eb69ac9f..348605fd6b2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index d34a2a29835..45cb72d1fb7 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £16.74
+£7.20 | £16.74
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_free/5.txt
index 1ee25dd21c3..6208aa6e37e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.98
+£7.20 | £18.98
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/no.txt
index c68f0abdbca..316978e61f4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index c68f0abdbca..316978e61f4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index a3f043d095f..a2ee1da57e1 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £8.66
+£7.20 | £8.66
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index cac558c1b02..448c6472624 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10.15
+£7.20 | £10.15
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/no.txt
index b3800def703..dbaab0a72bf 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/no.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index b3800def703..dbaab0a72bf 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index d23d9e5b0c2..2826dd3e14b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | -£55.92 * | £998.75
+£7.20 | -£55.92 * | £1,009.95
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_free/5.txt
index da4d1075f5d..743eb4b481c 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £13.28
+£7.20 | £13.28
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/no.txt
index 76825433b61..550e9dfcdab 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 76825433b61..550e9dfcdab 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 05dd6e3c1ad..a0909fbb0e1 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | -£35.20 * | £1,000.75
+£7.20 | -£35.20 * | £1,017.55
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 8b63e80ff2d..2a07bc32e14 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10.94
+£7.20 | £10.94
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/no.txt
index 1a2eb69ac9f..348605fd6b2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 1a2eb69ac9f..348605fd6b2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index ef9da1b5dc1..d923d2912e3 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | -£43.42 * | £798.75
+£7.20 | -£43.42 * | £809.95
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_free/5.txt
index 52f1853a629..57aaf3c6b6b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £25.78
+£7.20 | £25.78
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/no.txt
index c68f0abdbca..316978e61f4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index c68f0abdbca..316978e61f4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index d4d23b145b9..0839d8bef1f 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | -£31.45 * | £910.75
+£7.20 | -£31.45 * | £927.55
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index d7d6a4abe6d..902803a1877 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £14.69
+£7.20 | £14.69
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 0278e79d273..748c4a24737 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index d4b9e54c089..4f0c9ee41ed 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 964ff8d8a45..cee706288af 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 49d9a724025..ce3ea516388 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -10,8 +10,6 @@ The National Minimum Wage per hour for your age | Your actual pay | For each pay
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.html
index b00188609f0..980e2e3e06c 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
@@ -67,7 +67,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24.html
similarity index 92%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25.html
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24.html
index 0251d531522..92d3a87ac96 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,13 +22,13 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
 
     <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
+      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
         <div class="current-question" id="current-question">
           <div class="question">
   <h2>
@@ -73,7 +73,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
@@ -95,10 +95,10 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">How old are you?</td>
     <td class="previous-question-body">
-    25</td>
+    24</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=24">
       Change<span class="visuallyhidden"> answer to "How old are you?"</span>
 </a>  </td>
 </tr>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1.html
similarity index 92%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1.html
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1.html
index 66ed717879b..34da4201383 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,13 +22,13 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
 
     <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
+      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
         <div class="current-question" id="current-question">
           <div class="question">
   <h2>
@@ -68,7 +68,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
@@ -90,10 +90,10 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">How old are you?</td>
     <td class="previous-question-body">
-    25</td>
+    24</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=24">
       Change<span class="visuallyhidden"> answer to "How old are you?"</span>
 </a>  </td>
 </tr>
@@ -104,7 +104,7 @@ <h3 class="previous-answers-title">
     1</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24?previous_response=1">
       Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
 </a>  </td>
 </tr>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/no.txt
new file mode 100644
index 00000000000..a0218d8979e
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/no.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.25 * | £4
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged.html
similarity index 91%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged.html
index 7c346a48068..6412c49a480 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,13 +22,13 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
 
     <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
+      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
         <div class="current-question" id="current-question">
           <div class="question">
   <h2>
@@ -67,7 +67,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
@@ -89,10 +89,10 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">How old are you?</td>
     <td class="previous-question-body">
-    25</td>
+    24</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=24">
       Change<span class="visuallyhidden"> answer to "How old are you?"</span>
 </a>  </td>
 </tr>
@@ -103,7 +103,7 @@ <h3 class="previous-answers-title">
     1</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24?previous_response=1">
       Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
 </a>  </td>
 </tr>
@@ -114,7 +114,7 @@ <h3 class="previous-answers-title">
     16.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1?previous_response=16.0">
       Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
 </a>  </td>
 </tr>
@@ -125,7 +125,7 @@ <h3 class="previous-answers-title">
     £100</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0?previous_response=100.0">
       Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
 </a>  </td>
 </tr>
@@ -136,7 +136,7 @@ <h3 class="previous-answers-title">
     0.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=0.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0?previous_response=0.0">
       Change<span class="visuallyhidden"> answer to "How many hours of overtime do you work during the pay period?"</span>
 </a>  </td>
 </tr>
@@ -147,7 +147,7 @@ <h3 class="previous-answers-title">
     Yes, the accommodation is charged for</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0?previous_response=yes_charged">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0?previous_response=yes_charged">
       Change<span class="visuallyhidden"> answer to "Does your employer provide you with accommodation?"</span>
 </a>  </td>
 </tr>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..a0218d8979e
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.25 * | £4
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
new file mode 100644
index 00000000000..cf61b296958
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £4.24 * | £36.12
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_free.html
similarity index 91%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_free.html
index 82e8136498f..7a4672619b2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_free.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,13 +22,13 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
 
     <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
+      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_free" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
         <div class="current-question" id="current-question">
           <div class="question">
   <h2>
@@ -67,7 +67,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
@@ -89,10 +89,10 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">How old are you?</td>
     <td class="previous-question-body">
-    25</td>
+    24</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=24">
       Change<span class="visuallyhidden"> answer to "How old are you?"</span>
 </a>  </td>
 </tr>
@@ -103,7 +103,7 @@ <h3 class="previous-answers-title">
     1</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24?previous_response=1">
       Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
 </a>  </td>
 </tr>
@@ -114,7 +114,7 @@ <h3 class="previous-answers-title">
     16.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1?previous_response=16.0">
       Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
 </a>  </td>
 </tr>
@@ -125,7 +125,7 @@ <h3 class="previous-answers-title">
     £100</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0?previous_response=100.0">
       Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
 </a>  </td>
 </tr>
@@ -136,7 +136,7 @@ <h3 class="previous-answers-title">
     0.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=0.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0?previous_response=0.0">
       Change<span class="visuallyhidden"> answer to "How many hours of overtime do you work during the pay period?"</span>
 </a>  </td>
 </tr>
@@ -147,7 +147,7 @@ <h3 class="previous-answers-title">
     Yes, the accommodation is free</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0?previous_response=yes_free">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0?previous_response=yes_free">
       Change<span class="visuallyhidden"> answer to "Does your employer provide you with accommodation?"</span>
 </a>  </td>
 </tr>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_free/5.txt
new file mode 100644
index 00000000000..0b18b537c29
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0/yes_free/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.48 * | £0.37
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.html
similarity index 92%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.html
index 60f6eb52c33..71ab158a726 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/0.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,13 +22,13 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
 
     <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
+      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0/0.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
         <div class="current-question" id="current-question">
           <div class="question">
   <h2>
@@ -86,7 +86,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
@@ -108,10 +108,10 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">How old are you?</td>
     <td class="previous-question-body">
-    25</td>
+    24</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=24">
       Change<span class="visuallyhidden"> answer to "How old are you?"</span>
 </a>  </td>
 </tr>
@@ -122,7 +122,7 @@ <h3 class="previous-answers-title">
     1</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24?previous_response=1">
       Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
 </a>  </td>
 </tr>
@@ -133,7 +133,7 @@ <h3 class="previous-answers-title">
     16.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1?previous_response=16.0">
       Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
 </a>  </td>
 </tr>
@@ -144,7 +144,7 @@ <h3 class="previous-answers-title">
     £100</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0?previous_response=100.0">
       Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
 </a>  </td>
 </tr>
@@ -155,7 +155,7 @@ <h3 class="previous-answers-title">
     0.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=0.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0?previous_response=0.0">
       Change<span class="visuallyhidden"> answer to "How many hours of overtime do you work during the pay period?"</span>
 </a>  </td>
 </tr>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/no.txt
new file mode 100644
index 00000000000..9774d54e545
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/no.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.25 * | £6
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..9774d54e545
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.25 * | £6
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
new file mode 100644
index 00000000000..fbe8eb66609
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £4.91 * | £38.12
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/yes_free/5.txt
new file mode 100644
index 00000000000..1c4fa791775
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.40 * | £2.37
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.html
similarity index 91%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.html
index 19b0298822e..06047f288cd 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.0/8.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,13 +22,13 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
 
     <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
+      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0/8.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
         <div class="current-question" id="current-question">
           <div class="question">
   <h2>
@@ -67,7 +67,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
@@ -89,10 +89,10 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">How old are you?</td>
     <td class="previous-question-body">
-    25</td>
+    24</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=24">
       Change<span class="visuallyhidden"> answer to "How old are you?"</span>
 </a>  </td>
 </tr>
@@ -103,7 +103,7 @@ <h3 class="previous-answers-title">
     1</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24?previous_response=1">
       Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
 </a>  </td>
 </tr>
@@ -114,7 +114,7 @@ <h3 class="previous-answers-title">
     16.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1?previous_response=16.0">
       Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
 </a>  </td>
 </tr>
@@ -125,7 +125,7 @@ <h3 class="previous-answers-title">
     £100</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0?previous_response=100.0">
       Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
 </a>  </td>
 </tr>
@@ -136,7 +136,7 @@ <h3 class="previous-answers-title">
     8.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=8.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0?previous_response=8.0">
       Change<span class="visuallyhidden"> answer to "How many hours of overtime do you work during the pay period?"</span>
 </a>  </td>
 </tr>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.html
similarity index 91%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.html
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.html
index 0563a1b6357..593a6392b02 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/100.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,13 +22,13 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
 
     <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
+      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0/100.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
         <div class="current-question" id="current-question">
           <div class="question">
   <h2>
@@ -68,7 +68,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
@@ -90,10 +90,10 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">How old are you?</td>
     <td class="previous-question-body">
-    25</td>
+    24</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=24">
       Change<span class="visuallyhidden"> answer to "How old are you?"</span>
 </a>  </td>
 </tr>
@@ -104,7 +104,7 @@ <h3 class="previous-answers-title">
     1</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24?previous_response=1">
       Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
 </a>  </td>
 </tr>
@@ -115,7 +115,7 @@ <h3 class="previous-answers-title">
     16.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1?previous_response=16.0">
       Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
 </a>  </td>
 </tr>
@@ -126,7 +126,7 @@ <h3 class="previous-answers-title">
     £100</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0?previous_response=100.0">
       Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
 </a>  </td>
 </tr>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/no.txt
new file mode 100644
index 00000000000..1a2eb69ac9f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/no.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £18.75
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..1a2eb69ac9f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £18.75
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
new file mode 100644
index 00000000000..d34a2a29835
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £16.74
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/yes_free/5.txt
new file mode 100644
index 00000000000..1ee25dd21c3
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/0.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £18.98
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/no.txt
new file mode 100644
index 00000000000..c68f0abdbca
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/no.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..c68f0abdbca
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
new file mode 100644
index 00000000000..a3f043d095f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £8.66
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/yes_free/5.txt
new file mode 100644
index 00000000000..cac558c1b02
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10.15
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.html
similarity index 92%
rename from test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.html
rename to test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.html
index df441321bfc..cd8dd888ea2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.html
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/1/16.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,13 +22,13 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
 
     <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
+      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1/16.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
         <div class="current-question" id="current-question">
           <div class="question">
   <h2>
@@ -68,7 +68,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you're getting the National Minimum Wage (from October 2015)</td>
+    If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
@@ -90,10 +90,10 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">How old are you?</td>
     <td class="previous-question-body">
-    25</td>
+    24</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=24">
       Change<span class="visuallyhidden"> answer to "How old are you?"</span>
 </a>  </td>
 </tr>
@@ -104,7 +104,7 @@ <h3 class="previous-answers-title">
     1</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24?previous_response=1">
       Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
 </a>  </td>
 </tr>
@@ -115,7 +115,7 @@ <h3 class="previous-answers-title">
     16.0</td>
 
   <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
+    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/24/1?previous_response=16.0">
       Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
 </a>  </td>
 </tr>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/no.txt
new file mode 100644
index 00000000000..a0218d8979e
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/no.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.25 * | £4
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..a0218d8979e
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.25 * | £4
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
new file mode 100644
index 00000000000..35c54c3c121
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | -£55.92 * | £998.75
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/yes_free/5.txt
new file mode 100644
index 00000000000..da4d1075f5d
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/0.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £13.28
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/no.txt
new file mode 100644
index 00000000000..9774d54e545
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/no.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.25 * | £6
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..9774d54e545
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | £6.25 * | £6
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
new file mode 100644
index 00000000000..1655ed5207a
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | -£35.20 * | £1,000.75
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/yes_free/5.txt
new file mode 100644
index 00000000000..8b63e80ff2d
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10.94
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/no.txt
new file mode 100644
index 00000000000..1a2eb69ac9f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/no.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £18.75
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..1a2eb69ac9f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £18.75
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
new file mode 100644
index 00000000000..f6f70f2555f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | -£43.42 * | £798.75
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/yes_free/5.txt
new file mode 100644
index 00000000000..52f1853a629
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/0.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £25.78
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/no.txt
new file mode 100644
index 00000000000..c68f0abdbca
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/no.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
new file mode 100644
index 00000000000..c68f0abdbca
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £10
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
new file mode 100644
index 00000000000..adc885c5a7a
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -0,0 +1,28 @@
+
+
+$C
+You aren't getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+- | - | -
+£6.50 | -£31.45 * | £910.75
+
+\* This figure has been rounded to the nearest penny.
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/yes_free/5.txt
new file mode 100644
index 00000000000..d7d6a4abe6d
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/24/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -0,0 +1,26 @@
+
+
+$C
+You are getting the National Minimum Wage.
+$C
+
+The National Minimum Wage per hour for your age | Your actual pay
+- | -
+£6.50 | £14.69
+
+If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+
+This result is an estimate. If you have any questions, call the confidential helpline.
+
+$C
+**Acas helpline**\\
+Telephone: 0300 123 1100\\
+Monday to Friday, 8am to 8pm\\
+Saturday, 9am to 1pm\\
+[Find out about call charges](/call-charges)
+$C
+
+Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/no.txt
index b3800def703..dbaab0a72bf 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/no.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index b3800def703..dbaab0a72bf 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 74da26a701a..6dbf560f460 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £4.24 * | £36.12
+£7.20 | £4.24 * | £47.32
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free/5.txt
index 321e938a963..aec61ad9a63 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.48 * | £0.37
+£7.20 | £6.48 * | £11.57
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/no.txt
index 76825433b61..550e9dfcdab 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 76825433b61..550e9dfcdab 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 5ea638790c0..e9a528c0006 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £4.91 * | £38.12
+£7.20 | £4.91 * | £54.92
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index d90e24906bc..20cb45daaf2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.40 * | £2.37
+£7.20 | £6.40 * | £19.17
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/no.txt
index 1a2eb69ac9f..348605fd6b2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 1a2eb69ac9f..348605fd6b2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index d34a2a29835..45cb72d1fb7 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £16.74
+£7.20 | £16.74
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_free/5.txt
index 1ee25dd21c3..6208aa6e37e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.98
+£7.20 | £18.98
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/no.txt
index c68f0abdbca..316978e61f4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index c68f0abdbca..316978e61f4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index a3f043d095f..a2ee1da57e1 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £8.66
+£7.20 | £8.66
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index cac558c1b02..448c6472624 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10.15
+£7.20 | £10.15
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/no.txt
index b3800def703..dbaab0a72bf 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/no.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index b3800def703..dbaab0a72bf 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index d23d9e5b0c2..2826dd3e14b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | -£55.92 * | £998.75
+£7.20 | -£55.92 * | £1,009.95
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_free/5.txt
index da4d1075f5d..743eb4b481c 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £13.28
+£7.20 | £13.28
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/no.txt
index 76825433b61..550e9dfcdab 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 76825433b61..550e9dfcdab 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 05dd6e3c1ad..a0909fbb0e1 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | -£35.20 * | £1,000.75
+£7.20 | -£35.20 * | £1,017.55
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 8b63e80ff2d..2a07bc32e14 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10.94
+£7.20 | £10.94
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/no.txt
index 1a2eb69ac9f..348605fd6b2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 1a2eb69ac9f..348605fd6b2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index ef9da1b5dc1..d923d2912e3 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | -£43.42 * | £798.75
+£7.20 | -£43.42 * | £809.95
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_free/5.txt
index 52f1853a629..57aaf3c6b6b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £25.78
+£7.20 | £25.78
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/no.txt
index c68f0abdbca..316978e61f4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index c68f0abdbca..316978e61f4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index d4d23b145b9..0839d8bef1f 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,17 +1,15 @@
 
 
 $C
-You aren't getting the National Minimum Wage.
+You aren't getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
+The National Living Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.50 | -£31.45 * | £910.75
+£7.20 | -£31.45 * | £927.55
 
 \* This figure has been rounded to the nearest penny.
 
-^Your actual pay should increase to at least £7.20 per hour from 1 April 2016.^
-
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index d7d6a4abe6d..902803a1877 100644
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are getting the National Minimum Wage.
+You are getting the National Living Wage.
 $C
 
-The National Minimum Wage per hour for your age | Your actual pay
+The National Living Wage per hour for your age | Your actual pay
 - | -
-£6.50 | £14.69
+£7.20 | £14.69
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016.html b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016.html
deleted file mode 100644
index 0b51c5a60b6..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        National Minimum Wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment_april_2016" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Will you be in the first year of an apprenticeship on 1 April 2016?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you'll get the national living wage (from 1 April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment_april_2016">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/no.txt
deleted file mode 100644
index 385eb7f2c86..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/no.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £18.75
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
deleted file mode 100644
index 385eb7f2c86..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £18.75
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
deleted file mode 100644
index 5ba1fd8b316..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £16.74
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/yes_free/5.txt
deleted file mode 100644
index 42aaac2a730..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £18.98
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
deleted file mode 100644
index 100cb1faaed..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £8.66
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
deleted file mode 100644
index 3a7306eb250..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £10.15
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/yes_free/5.txt
deleted file mode 100644
index 53621f707ac..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £13.28
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
deleted file mode 100644
index fa24cc5b686..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £10.94
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/no.txt
deleted file mode 100644
index 385eb7f2c86..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/no.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £18.75
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
deleted file mode 100644
index 385eb7f2c86..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £18.75
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/yes_free/5.txt
deleted file mode 100644
index e823ac94a53..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £25.78
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
deleted file mode 100644
index ff65b678d06..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-$C
-You will be getting the national living wage
-$C
-
-The national living wage per hour for your age will be | Your actual pay
-- | -
-£7.20 | £14.69
-
-If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
-
-This result is an estimate. If you have any questions, call the confidential helpline.
-
-$C
-**Acas helpline**\\
-Telephone: 0300 123 1100\\
-Monday to Friday, 8am to 8pm\\
-Saturday, 9am to 1pm\\
-[Find out about call charges](/call-charges)
-$C
-
-Read the guidance on [how to calculate the National Minimum Wage](/minimum-wage-different-types-work).
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/yes.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/yes.txt
deleted file mode 100644
index e44c8543197..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/yes.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-You won't get the national living wage as a first year apprentice.
-
-You'll only get the [National Minimum Wage for an apprentice.](/apprenticeships-guide/pay-and-conditions)
-
-
-
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment.html b/test/artefacts/am-i-getting-minimum-wage/past_payment.html
index c8943f2fef4..6512687db47 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/no.txt
index 8d0a7c72a60..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index ea16d19ae47..00902ed0f37 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £6.23
+£7.20 | £6.23 * | £14.07
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index ea3ad5b5767..d75cae942cc 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £4.22 * | £27.50
+£7.20 | £4.22 * | £43.12
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index a0bfc0bdba1..5944f31a7cd 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £6.45
+£7.20 | £6.45 * | £10.84
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index 8d0a7c72a60..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index ea16d19ae47..d22398272cf 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £6.23
+£7.20 | £6.23 * | £20.94
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index b4870fa679a..a50d5fdf623 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £4.89 * | £22.78
+£7.20 | £4.89 * | £49.98
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index 811cbe028e6..816901d78f0 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £6.38
+£7.20 | £6.38 * | £17.70
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/no.txt
index 5881c261e44..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index ae51b1e80a7..d965b329326 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £18.73
+£7.20 | £18.73
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 30d99a9d43b..8477332ef08 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £16.72
+£7.20 | £16.72
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index 2b4acfccfc6..ece9953e3b6 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £18.95
+£7.20 | £18.95
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index 1fcc70d18f3..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 185b7ccd3dd..070f3c5aaf8 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £9.98
+£7.20 | £9.98
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 343d0c6bccc..9dea9900905 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £8.64
+£7.20 | £8.64
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index eaad023d255..96348eeb264 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £10.13
+£7.20 | £10.13
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/no.txt
index 8d0a7c72a60..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 0e457c71c3f..6a1de41c944 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £5.50 * | £4.13
+£7.20 | £5.50 * | £24.52
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 3d2e2865aa1..5086b6a217b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | -£56.78 * | £1,134.56
+£7.20 | -£56.78 * | £924.16
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index f814eae2572..9885fad0a70 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £12.42
+£7.20 | £12.42
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index 8d0a7c72a60..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 9f16af6b14b..f64f9748e42 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | £5.75
+£7.20 | £5.75 * | £31.38
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index d27e694d76c..91b3e124dc2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | -£35.77 * | £1,129.84
+£7.20 | -£35.77 * | £931.02
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index a78ad41939e..7fc746cb16a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £10.37
+£7.20 | £10.37
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/no.txt
index 5881c261e44..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 4b6d277feaf..6a8826bce69 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £18
+£7.20 | £18
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index df7eaff5718..fbc43453384 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | -£44.28 * | £907.69
+£7.20 | -£44.28 * | £743.60
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 10c2373509d..acf05ba446a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £24.92
+£7.20 | £24.92
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index 1fcc70d18f3..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 6956c79933a..816ce454afc 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £9.50
+£7.20 | £9.50
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 820e0c32405..bee7ca9df58 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.73 | -£32.02 * | £1,027.75
+£7.20 | -£32.02 * | £849.77
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index f898e2c620b..280fa54d652 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.73 | £14.12
+£7.20 | £14.12
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/no.txt
index cc015bd1364..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 9281cd5abd9..4c291721340 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £6.23
+£7.20 | £6.23 * | £14.04
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index b52bd95c2d4..7a885437611 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £4.22 * | £28.39
+£7.20 | £4.22 * | £43.09
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index 7d1a983b5d8..262fe18f950 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £6.45
+£7.20 | £6.45 * | £10.82
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index cc015bd1364..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index a91206cfeb4..fddb170c6fa 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £6.24
+£7.20 | £6.24 * | £20.90
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index aded9f9d657..e424bc688f4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £4.89 * | £24.35
+£7.20 | £4.89 * | £49.95
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index e9264a79a43..c7f6229a2bd 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £6.38
+£7.20 | £6.38 * | £17.68
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/no.txt
index 65bc8400a8a..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 02062145373..d965b329326 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £18.73
+£7.20 | £18.73
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 8f66ba0d7bb..8477332ef08 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £16.72
+£7.20 | £16.72
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index ea017dfe251..ece9953e3b6 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £18.95
+£7.20 | £18.95
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index 63368943f78..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 5c8210afe92..93ab950f89a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £9.99
+£7.20 | £9.99
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 05e7096be7a..9dea9900905 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £8.64
+£7.20 | £8.64
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 5f188ffacd3..96348eeb264 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £10.13
+£7.20 | £10.13
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/no.txt
index cc015bd1364..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 8dbc6cbae9f..12e5ad1d639 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £5.57 * | £4.09
+£7.20 | £5.57 * | £23.52
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index eb659fc88fd..9743e688b4d 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | -£56.71 * | £1,120.89
+£7.20 | -£56.71 * | £923.16
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index 8a4559decc0..820ecf6bb43 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £12.49
+£7.20 | £12.49
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index cc015bd1364..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 5a4c0ad7366..8943c3b99b6 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | £5.80 * | £0.06
+£7.20 | £5.80 * | £30.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 915266c665f..b1ed9851cb1 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | -£35.72 * | £1,116.86
+£7.20 | -£35.72 * | £930.02
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 64cc89d6eb0..dcf692a3bb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £10.41
+£7.20 | £10.41
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/no.txt
index 65bc8400a8a..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 6f93c4d0b57..b6191eeb126 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £18.07
+£7.20 | £18.07
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 928ff5a9d51..cb30de67137 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | -£44.21 * | £896.75
+£7.20 | -£44.21 * | £742.61
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 323d78650c2..11fa3903bb7 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £24.99
+£7.20 | £24.99
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index 63368943f78..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 7ca83f69262..10ea6c08e35 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £9.55
+£7.20 | £9.55
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 09946796d98..92e02feaa3a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.80 | -£31.97 * | £1,015.99
+£7.20 | -£31.97 * | £848.77
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index 73bb290f2ab..b8558528847 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.80 | £14.16
+£7.20 | £14.16
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/no.txt
index 797352441d8..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 83acf7e779f..904c70498c2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £6.23
+£7.20 | £6.23 * | £13.98
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index c1a8aadcfa0..2983be3cf82 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £4.22 * | £29.96
+£7.20 | £4.22 * | £43.02
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index 10c9ba8f000..0599dde1b24 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £6.46
+£7.20 | £6.46 * | £10.74
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index 797352441d8..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 22fcc9ddd17..9550721133b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £6.24
+£7.20 | £6.24 * | £20.84
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index e902861d62b..fc389968d6c 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £4.90 * | £27.15
+£7.20 | £4.90 * | £49.88
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index f39689e5ec5..d246b7589b7 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £6.39
+£7.20 | £6.39 * | £17.60
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/no.txt
index e5b18e5f9cf..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index e264dad0bff..d965b329326 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £18.73
+£7.20 | £18.73
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index b3b029ca5a2..8477332ef08 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £16.72
+£7.20 | £16.72
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index 9e1488360b9..13a3c00cb16 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £18.96
+£7.20 | £18.96
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index 0de8e8c2ce9..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 7235be853a0..93ab950f89a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £9.99
+£7.20 | £9.99
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index af004077203..0ed2bc4c7ce 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £8.65
+£7.20 | £8.65
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 036a4c1a00d..54524cdc434 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £10.14
+£7.20 | £10.14
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/no.txt
index 797352441d8..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index c37d487b5ef..6dc127f719b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £5.71 * | £3.86
+£7.20 | £5.71 * | £21.52
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index dc87d1c13dd..8d526a2c855 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | -£56.57 * | £1,096.17
+£7.20 | -£56.57 * | £921.16
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index 1e057b1e182..7607fac846a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £12.63
+£7.20 | £12.63
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index 797352441d8..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 5fa27761a71..b2b02c724e2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | £5.89 * | £1.05
+£7.20 | £5.89 * | £28.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index fd1925e88f5..2575966bc73 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | -£35.63 * | £1,093.36
+£7.20 | -£35.63 * | £928.02
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 89f60302f01..417b6ae65b0 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £10.50
+£7.20 | £10.50
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/no.txt
index e5b18e5f9cf..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 85b1b16850a..a51e6f5200b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £18.21
+£7.20 | £18.21
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 79bba5e9032..034b3b8d83a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | -£44.07 * | £876.94
+£7.20 | -£44.07 * | £740.60
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 02d35ab3cc1..4fc89cb5623 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £25.13
+£7.20 | £25.13
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index 0de8e8c2ce9..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 158751ce163..4626b35c342 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £9.64
+£7.20 | £9.64
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 010b466b7bc..5b2643a8fd6 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£5.93 | -£31.88 * | £994.71
+£7.20 | -£31.88 * | £846.77
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index ca48b9ae297..1d82b399208 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£5.93 | £14.25
+£7.20 | £14.25
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/no.txt
index d1da45ef442..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 69352608528..9dac58edf25 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £6.24
+£7.20 | £6.24 * | £13.89
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index cb5b2ac5d69..997a99ce33f 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £4.23 * | £31.70
+£7.20 | £4.23 * | £42.95
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index aa429b57cad..118f860f90c 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £6.46
+£7.20 | £6.46 * | £10.67
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index d1da45ef442..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 69352608528..142079f089b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £6.24
+£7.20 | £6.24 * | £20.75
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 24061354738..541f0d3fe31 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £4.90 * | £30.24
+£7.20 | £4.90 * | £49.81
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index a0db40a948d..36955ee9069 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £6.39
+£7.20 | £6.39 * | £17.53
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/no.txt
index f8ae5ee4f34..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 82336c91597..a32b57e1adc 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £18.74
+£7.20 | £18.74
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index f12413b2c22..0a5d9642000 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £16.73
+£7.20 | £16.73
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index 2387411ec3e..13a3c00cb16 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £18.96
+£7.20 | £18.96
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index 0f1f1c2f6f6..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index b5cdb63a22c..93ab950f89a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £9.99
+£7.20 | £9.99
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 5b03e3c7f12..0ed2bc4c7ce 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £8.65
+£7.20 | £8.65
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 243c1c33bd1..54524cdc434 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £10.14
+£7.20 | £10.14
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/no.txt
index d1da45ef442..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 86bbc40abd1..370991cff00 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £5.88 * | £3.49
+£7.20 | £5.88 * | £19.12
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 94bec26eabf..0308a1555c1 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | -£56.41 * | £1,068.84
+£7.20 | -£56.41 * | £918.76
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index cedb4d14973..5b29a8a7335 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £12.80
+£7.20 | £12.80
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index d1da45ef442..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 78e4a5b6f5a..c608da3af48 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | £6 * | £2.03
+£7.20 | £6 * | £25.98
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index cb480755ca7..868610af359 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | -£35.52 * | £1,067.39
+£7.20 | -£35.52 * | £925.62
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 4f14ce9b118..5b2ea846043 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £10.61
+£7.20 | £10.61
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/no.txt
index f8ae5ee4f34..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 4737d1e8abd..1bc1864138e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £18.38
+£7.20 | £18.38
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 6899002ed61..8a4ebfce0dc 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | -£43.91 * | £855.03
+£7.20 | -£43.91 * | £738.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 845dc1c0111..73a8628cbfa 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £25.30
+£7.20 | £25.30
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index 0f1f1c2f6f6..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 4bf905c1b0c..cbe4cf5cd63 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £9.75
+£7.20 | £9.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index fd3fb135c61..4829aa12e80 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.08 | -£31.77 * | £971.17
+£7.20 | -£31.77 * | £844.37
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index 1fdb5907a42..b31930b7392 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.08 | £14.36
+£7.20 | £14.36
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/no.txt
index 8f378b23659..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 1173a1c9490..4d45177c583 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6.24
+£7.20 | £6.24 * | £13.84
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 740b35bc072..0bd43489444 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £4.23 * | £32.91
+£7.20 | £4.23 * | £42.88
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index 36e7fdd0e4b..82e5e9d01e7 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6.47
+£7.20 | £6.47 * | £10.61
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index 8f378b23659..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 1173a1c9490..205d294c1dd 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6.24
+£7.20 | £6.24 * | £20.70
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index c552769e864..39a02c9bb01 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £4.90 * | £32.41
+£7.20 | £4.90 * | £49.74
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index f138835a9d6..f8f52263bf0 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6.39
+£7.20 | £6.39 * | £17.47
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/no.txt
index a61a5152fb1..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index f6f1f57c15b..a32b57e1adc 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £18.74
+£7.20 | £18.74
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index ea83202657a..0a5d9642000 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £16.73
+£7.20 | £16.73
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index 0d6d595257f..d63186c8d66 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £18.97
+£7.20 | £18.97
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index e19913fbfb0..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 228d4644fc2..93ab950f89a 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £9.99
+£7.20 | £9.99
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 2e1e066a436..0ed2bc4c7ce 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £8.65
+£7.20 | £8.65
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 123896ce4cc..54524cdc434 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £10.14
+£7.20 | £10.14
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/no.txt
index 8f378b23659..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 7aaf30a95f4..c022eb3d601 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6 * | £3.18
+£7.20 | £6 * | £17.32
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 2b09aade1e7..c971bc6775e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | -£56.28 * | £1,049.61
+£7.20 | -£56.28 * | £916.96
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index d0bb845e7f8..471b56b1bc8 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £12.92
+£7.20 | £12.92
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index 8f378b23659..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index f27119486a2..b1c035266cb 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | £6.08 * | £2.68
+£7.20 | £6.08 * | £24.19
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 4bd72908fe5..ff3e09ebb56 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | -£35.44 * | £1,049.10
+£7.20 | -£35.44 * | £923.82
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 8eb8446d8f1..ae7ace40047 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £10.70
+£7.20 | £10.70
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/no.txt
index a61a5152fb1..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index b6f75663697..7553c5a7008 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £18.50
+£7.20 | £18.50
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 8eeeedbfcc7..195934f25e8 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | -£43.78 * | £839.59
+£7.20 | -£43.78 * | £736.40
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 6bb7b7315a9..13b42008586 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £25.42
+£7.20 | £25.42
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index e19913fbfb0..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index f1de4d48e9a..e6658615031 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £9.83
+£7.20 | £9.83
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 3f430e0a678..dba1e5a8bd2 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.19 | -£31.69 * | £954.60
+£7.20 | -£31.69 * | £842.57
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index 04fa6a36725..0d2392bf291 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.19 | £14.45
+£7.20 | £14.45
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/no.txt
index 8c9a351f84a..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.25 * | £0.99
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 13ae572f2df..101d24de5be 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.25 * | £1.05
+£7.20 | £6.25 * | £13.78
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 8e5ca8c68ce..1efc3b1b76e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £4.24 * | £34.20
+£7.20 | £4.24 * | £42.83
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index ced904b9f93..bc177b210fe 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.47
+£7.20 | £6.47 * | £10.55
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index 03832c4080c..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.25 * | £1.48
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index fc33db8210e..20c01785658 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.25 * | £1.55
+£7.20 | £6.25 * | £20.64
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 083eee1ffe6..82b32848dfa 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £4.91 * | £34.69
+£7.20 | £4.91 * | £49.69
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index 9370ba14970..76dcb75c168 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were getting the National Minimum Wage.
-
-Your employer doesn’t owe you any past payments.
+You weren't getting the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | Your actual pay
+The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.40
+£7.20 | £6.40 * | £17.41
+
+\* This figure has been rounded to the nearest penny.
 
-If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/no.txt
index ea9ee6d09ca..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index ea9ee6d09ca..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 869a055af3f..e19c466aff5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £16.74
+£7.20 | £16.74
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index bdf09d5ecad..d63186c8d66 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £18.97
+£7.20 | £18.97
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index 71c4536e3f9..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 71c4536e3f9..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 2079ad781fe..f47860841b5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £8.66
+£7.20 | £8.66
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 61534e03db4..41400eaf663 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £10.15
+£7.20 | £10.15
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/no.txt
index 8c9a351f84a..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.25 * | £0.99
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 10ef4cd0192..ad735b979cc 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.13 * | £3.04
+£7.20 | £6.13 * | £15.52
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index cfe5f164010..87a6e1f8865 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | -£56.16 * | £1,029.58
+£7.20 | -£56.16 * | £915.16
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index 2817b758122..840c250f003 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £13.05
+£7.20 | £13.05
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index 03832c4080c..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.25 * | £1.48
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 1f582d5afd3..c8dd612240b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | £6.17 * | £3.53
+£7.20 | £6.17 * | £22.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 9b9ff420572..8925daf3ccc 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | -£35.35 * | £1,030.07
+£7.20 | -£35.35 * | £922.03
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 10474d37b12..a86a0806c73 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £10.78
+£7.20 | £10.78
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/no.txt
index ea9ee6d09ca..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 84b1ed1c872..619c71efb6f 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £18.63
+£7.20 | £18.63
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index b33eb73dddd..a5b569a00dd 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | -£43.66 * | £823.55
+£7.20 | -£43.66 * | £734.61
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index b6d05f645aa..4908bce5ef8 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £25.55
+£7.20 | £25.55
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index 71c4536e3f9..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 59f11d07c3e..8af158c64c7 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £9.92
+£7.20 | £9.92
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 873a1212310..d6f1fd11333 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.31 | -£31.61 * | £937.36
+£7.20 | -£31.61 * | £840.78
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index 516c08253ff..504fef16bfa 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.31 | £14.53
+£7.20 | £14.53
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01.html
index 030a0e97d00..58947b1c375 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no.html
index 53e45b8c922..e5daab75cb1 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25.html
index a0f5a253ead..04e6abc2646 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1.html
index c410cc265e1..da7cc6bd4ca 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/no.txt
index c99b68b519e..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
index a6c2d28bd7e..ab80944bd08 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index c99b68b519e..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 0f99b2ee10b..a29e60672a3 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £4.24 * | £36.12
+£7.20 | £4.24 * | £42.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
index fd478bdc512..ef39a620e36 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index 4c192079d3a..bb66f65a938 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.48 * | £0.37
+£7.20 | £6.48 * | £10.45
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.html
index 6d3e53813f3..0999142ac23 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/0.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index bd47aaeb760..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index bd47aaeb760..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 2ecf9d9e881..24bc4789309 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £4.91 * | £38.12
+£7.20 | £4.91 * | £49.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index 04c67666a46..d54bd5bdc86 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.40 * | £2.37
+£7.20 | £6.40 * | £17.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.html
index d1ccdb4de11..286e5dc1e64 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.0/8.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.html
index 05b1d8d8104..499d5fc214b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/100.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/no.txt
index c852efe5e57..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index c852efe5e57..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 13ce2d21a43..e19c466aff5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £16.74
+£7.20 | £16.74
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index e6d3c7254b2..0386a5fdfa8 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £18.98
+£7.20 | £18.98
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index 7b722d64644..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 7b722d64644..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 8568597cd46..f47860841b5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £8.66
+£7.20 | £8.66
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index e2dd946a25b..41400eaf663 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £10.15
+£7.20 | £10.15
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.html
index 5aff36c20bd..497e1a1436c 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.html
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/1/16.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/no.txt
index c99b68b519e..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index c99b68b519e..ff98ee1bcb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index a780d4fdc10..285e465d8f0 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | -£55.92 * | £998.75
+£7.20 | -£55.92 * | £911.76
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index ad7cb3b2af5..39a3e703e0f 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £13.28
+£7.20 | £13.28
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index bd47aaeb760..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index bd47aaeb760..37a688a4a79 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 497618c1de0..6368f3bd022 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | -£35.20 * | £1,000.75
+£7.20 | -£35.20 * | £918.62
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 0b013fd2984..cdb1390b836 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £10.94
+£7.20 | £10.94
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/no.txt
index c852efe5e57..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index c852efe5e57..1639a008f49 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 48b03956e60..a8b68e54d91 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | -£43.42 * | £798.75
+£7.20 | -£43.42 * | £731.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index ddcbb3562b2..6e7b3721da5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £25.78
+£7.20 | £25.78
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index 7b722d64644..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 7b722d64644..12daf495a93 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 520271d289d..f5f3bdcf8ae 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£6.50 | -£31.45 * | £910.75
+£7.20 | -£31.45 * | £837.37
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index 03e1ae6bbf6..92521cd1cea 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay
 - | -
-£6.50 | £14.69
+£7.20 | £14.69
 
 If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/y.html b/test/artefacts/am-i-getting-minimum-wage/y.html
index bda8c0ef3ed..3c34fedd666 100644
--- a/test/artefacts/am-i-getting-minimum-wage/y.html
+++ b/test/artefacts/am-i-getting-minimum-wage/y.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for workers - GOV.UK</title>
+    <title>Minimum wage calculator for workers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for workers
+        Minimum wage calculator for workers
       </h1>
     </div>
   </header>
@@ -43,7 +43,7 @@ <h2>
     <li>
       <label for="response_0" class="selectable">
         <input type="radio" name="response" id="response_0" value="current_payment" />
-        If you're getting the National Minimum Wage (from October 2015)
+        If you're getting the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)
       </label>
     </li>
     <li>
@@ -52,12 +52,6 @@ <h2>
         If an employer owes you past payments (before October 2015)
       </label>
     </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="current_payment_april_2016" />
-        If you'll get the national living wage (from 1 April 2016)
-      </label>
-    </li>
 </ul>
 
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment.html b/test/artefacts/minimum-wage-calculator-employers/current_payment.html
index 2ab30d09970..223e1a44bbf 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -93,7 +93,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/no.txt
index 1e5df9b157e..545e4dbf337 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 1e5df9b157e..545e4dbf337 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 9230db31af9..ac561eedb1d 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £4.24 * | £36.12
+£7.20 | £4.24 * | £47.32
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_free/5.txt
index 7b5a2a6ceb4..182b8bf6e08 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.48 * | £0.37
+£7.20 | £6.48 * | £11.57
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/no.txt
index 6bcc2fea052..a4aff08f135 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 6bcc2fea052..a4aff08f135 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 7e53acc8d55..b22229a3bdc 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £4.91 * | £38.12
+£7.20 | £4.91 * | £54.92
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index 702663352ea..857cf48a22f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.40 * | £2.37
+£7.20 | £6.40 * | £19.17
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/no.txt
index 7a688dad903..246adf39bd1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 7a688dad903..246adf39bd1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index f1d0d06b563..0038e949d6f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £16.74
+£7.20 | £16.74
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_free/5.txt
index dd02538a96c..2c4f7590313 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.98
+£7.20 | £18.98
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/no.txt
index 0cbf21f3fc9..cc54ff68f55 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 0cbf21f3fc9..cc54ff68f55 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index ee943434b69..ed2e1641041 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £8.66
+£7.20 | £8.66
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index a0c7664c9c7..1ea5ee3e8db 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10.15
+£7.20 | £10.15
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/no.txt
index 1e5df9b157e..545e4dbf337 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 1e5df9b157e..545e4dbf337 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 706a4feaf8c..a02ad80aa91 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | -£55.92 * | £998.75
+£7.20 | -£55.92 * | £1,009.95
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_free/5.txt
index 006c1e17f93..01b15301ab9 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £13.28
+£7.20 | £13.28
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/no.txt
index 6bcc2fea052..a4aff08f135 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 6bcc2fea052..a4aff08f135 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index ec75e7a2148..e46f3e58cdf 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | -£35.20 * | £1,000.75
+£7.20 | -£35.20 * | £1,017.55
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 81105fdf96b..596922114ad 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10.94
+£7.20 | £10.94
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/no.txt
index 7a688dad903..246adf39bd1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 7a688dad903..246adf39bd1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 2460c71ed83..b93a11b3db0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | -£43.42 * | £798.75
+£7.20 | -£43.42 * | £809.95
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_free/5.txt
index 46a6bef0f41..eee305636a7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £25.78
+£7.20 | £25.78
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/no.txt
index 0cbf21f3fc9..cc54ff68f55 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 0cbf21f3fc9..cc54ff68f55 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 22652d40a4c..2e68514900c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | -£31.45 * | £910.75
+£7.20 | -£31.45 * | £927.55
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index f05f501cf50..e335454a1ab 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £14.69
+£7.20 | £14.69
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.html
index e95f29e32fe..03446c781f6 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -67,7 +67,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.html
index 77ccbde7de8..a78c116f156 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -73,7 +73,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.html
index a55e4e0d7f5..9f2534f7baa 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -68,7 +68,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/no.txt
index 1e5df9b157e..545e4dbf337 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html
index 6135af7877f..3d62ee16dc7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -67,7 +67,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 1e5df9b157e..545e4dbf337 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 9230db31af9..ac561eedb1d 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £4.24 * | £36.12
+£7.20 | £4.24 * | £47.32
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html
index 53c0192d70a..4c046ab336e 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -67,7 +67,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free/5.txt
index 7b5a2a6ceb4..182b8bf6e08 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.48 * | £0.37
+£7.20 | £6.48 * | £11.57
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html
index e74f96b2f31..a1971f52ba7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -86,7 +86,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/no.txt
index 6bcc2fea052..a4aff08f135 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 6bcc2fea052..a4aff08f135 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 7e53acc8d55..b22229a3bdc 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £4.91 * | £38.12
+£7.20 | £4.91 * | £54.92
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index 702663352ea..857cf48a22f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.40 * | £2.37
+£7.20 | £6.40 * | £19.17
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html
index 94cab6a01fd..24504bf863c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -67,7 +67,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.html
index ed3e93eb0a5..e7ae78d5feb 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -68,7 +68,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/no.txt
index 7a688dad903..246adf39bd1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 7a688dad903..246adf39bd1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index f1d0d06b563..0038e949d6f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £16.74
+£7.20 | £16.74
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_free/5.txt
index dd02538a96c..2c4f7590313 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.98
+£7.20 | £18.98
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/no.txt
index 0cbf21f3fc9..cc54ff68f55 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 0cbf21f3fc9..cc54ff68f55 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index ee943434b69..ed2e1641041 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £8.66
+£7.20 | £8.66
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index a0c7664c9c7..1ea5ee3e8db 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10.15
+£7.20 | £10.15
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.html
index 931989fdf4d..86e44840b83 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.html
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -68,7 +68,7 @@ <h3 class="previous-answers-title">
               <tr class="section">
   <td class="previous-question-title">What would you like to check?</td>
     <td class="previous-question-body">
-    If you’re paying a worker the National Wage (from October 2015)</td>
+    If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)</td>
 
   <td class="link-right">
     <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/no.txt
index 1e5df9b157e..545e4dbf337 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 1e5df9b157e..545e4dbf337 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £15.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 706a4feaf8c..a02ad80aa91 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | -£55.92 * | £998.75
+£7.20 | -£55.92 * | £1,009.95
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_free/5.txt
index 006c1e17f93..01b15301ab9 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £13.28
+£7.20 | £13.28
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/no.txt
index 6bcc2fea052..a4aff08f135 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 6bcc2fea052..a4aff08f135 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £22.80
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index ec75e7a2148..e46f3e58cdf 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | -£35.20 * | £1,000.75
+£7.20 | -£35.20 * | £1,017.55
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 81105fdf96b..596922114ad 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10.94
+£7.20 | £10.94
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/no.txt
index 7a688dad903..246adf39bd1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 7a688dad903..246adf39bd1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 2460c71ed83..b93a11b3db0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | -£43.42 * | £798.75
+£7.20 | -£43.42 * | £809.95
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_free/5.txt
index 46a6bef0f41..eee305636a7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £25.78
+£7.20 | £25.78
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/no.txt
index 0cbf21f3fc9..cc54ff68f55 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 0cbf21f3fc9..cc54ff68f55 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 22652d40a4c..2e68514900c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You aren't paying the National Minimum Wage.
+You aren't paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
+The National Living Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£6.50 | -£31.45 * | £910.75
+£7.20 | -£31.45 * | £927.55
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index f05f501cf50..e335454a1ab 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -1,12 +1,12 @@
 
 
 $C
-You are paying the National Minimum Wage.
+You are paying the National Living Wage.
 $C
 
-The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
+The National Living Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.50 | £14.69
+£7.20 | £14.69
 
 If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/minimum-wage-calculator-employers.txt b/test/artefacts/minimum-wage-calculator-employers/minimum-wage-calculator-employers.txt
index 8f227580bd1..b4706b20a58 100644
--- a/test/artefacts/minimum-wage-calculator-employers/minimum-wage-calculator-employers.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/minimum-wage-calculator-employers.txt
@@ -1,6 +1,12 @@
-National Minimum Wage calculator for employers
+Minimum wage calculator for employers
 
-Check if you're paying a worker the National Minimum Wage or if you owe them payments from past years.
+Check if:
+
+- you’re paying a worker the National Minimum Wage
+- you’re paying a worker the National Living Wage
+- you owe your employee payments from previous years
+
+^Your employee must be at least 25 years old to get the national living wage.^
 
 
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment.html b/test/artefacts/minimum-wage-calculator-employers/past_payment.html
index c3d75afecb9..9d3d11f9de7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/no.txt
index 207a4a88d68..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index fe2a5ae1022..64244788cd0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £6.23
+£7.20 | £6.23 * | £14.07
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index a979270aaa7..3aa0b39d4fc 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £4.22 * | £27.50
+£7.20 | £4.22 * | £43.12
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index 29a293c3274..eeb11af22b7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £6.45
+£7.20 | £6.45 * | £10.84
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index 207a4a88d68..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index fe2a5ae1022..8569405572e 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £6.23
+£7.20 | £6.23 * | £20.94
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index eb27653869a..51fddc736e1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £4.89 * | £22.78
+£7.20 | £4.89 * | £49.98
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index 0dc87007c1d..59117b75991 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £6.38
+£7.20 | £6.38 * | £17.70
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/no.txt
index eaf5b1cdcea..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 9d3c3439e4d..f3aa3125e91 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £18.73
+£7.20 | £18.73
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 9351f8f0bc5..b91a966469a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £16.72
+£7.20 | £16.72
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index 14dc90292f0..c0f2b7d3928 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £18.95
+£7.20 | £18.95
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index f5f67ca4939..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 139e9071761..8531f804a26 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £9.98
+£7.20 | £9.98
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 3da9fbadccb..cd3179b96b1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £8.64
+£7.20 | £8.64
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index a7b2e6960a8..b76ba7c4a2a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £10.13
+£7.20 | £10.13
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/no.txt
index 207a4a88d68..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index f5dd71b0f77..4e4977684be 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £5.50 * | £4.13
+£7.20 | £5.50 * | £24.52
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index d4bc9c5e626..b9d3aaefa2c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | -£56.78 * | £1,134.56
+£7.20 | -£56.78 * | £924.16
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index 48f6cf14bc1..e55dd6f61cd 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £12.42
+£7.20 | £12.42
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index 207a4a88d68..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 054b7efd4c6..11cacf842de 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | £5.75
+£7.20 | £5.75 * | £31.38
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 9b3c2e48274..f6b7fc95f9c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | -£35.77 * | £1,129.84
+£7.20 | -£35.77 * | £931.02
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 3994c4d1637..63a6ed8d172 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £10.37
+£7.20 | £10.37
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/no.txt
index eaf5b1cdcea..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index dc2f4e54e8c..de625dd15f0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £18
+£7.20 | £18
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 98ef1a5dc3a..a2b635b5b24 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | -£44.28 * | £907.69
+£7.20 | -£44.28 * | £743.60
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 1dca92c59f6..ce78dbc9ac3 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £24.92
+£7.20 | £24.92
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index f5f67ca4939..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 9cafc8bf5b2..8d71d618f08 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £9.50
+£7.20 | £9.50
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 9434189a0fc..0fd3777c8c8 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.73 | -£32.02 * | £1,027.75
+£7.20 | -£32.02 * | £849.77
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index 42bdd378e74..06d9f09d307 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2008-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.73 | £14.12
+£7.20 | £14.12
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/no.txt
index 62ba13dd3d2..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 040b4c406ab..de52cded1d5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £6.23
+£7.20 | £6.23 * | £14.04
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index b141c6885c4..2481ccc5e0d 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £4.22 * | £28.39
+£7.20 | £4.22 * | £43.09
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index 4c153515276..dd9086b30d8 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £6.45
+£7.20 | £6.45 * | £10.82
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index 62ba13dd3d2..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index e4e7e4e4302..971cfeeee89 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £6.24
+£7.20 | £6.24 * | £20.90
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 3c67f005e64..c1f70d688b0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £4.89 * | £24.35
+£7.20 | £4.89 * | £49.95
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index a4e5553eccd..4eddd9b57ad 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £6.38
+£7.20 | £6.38 * | £17.68
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/no.txt
index f913879d0f7..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index c4e957c6972..f3aa3125e91 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £18.73
+£7.20 | £18.73
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 5a28dc43f98..b91a966469a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £16.72
+£7.20 | £16.72
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index a4f6d54803e..c0f2b7d3928 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £18.95
+£7.20 | £18.95
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index ba021270ed8..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index af5c257cbc5..dffd4cd91c6 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £9.99
+£7.20 | £9.99
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 0bc6f1fc2b0..cd3179b96b1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £8.64
+£7.20 | £8.64
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 31f7c7bec79..b76ba7c4a2a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £10.13
+£7.20 | £10.13
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/no.txt
index 62ba13dd3d2..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 6a0875a6464..a5b4a894f7e 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £5.57 * | £4.09
+£7.20 | £5.57 * | £23.52
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 6b66f9678ea..961242f305b 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | -£56.71 * | £1,120.89
+£7.20 | -£56.71 * | £923.16
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index dfd173d89eb..2b152c5188e 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £12.49
+£7.20 | £12.49
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index 62ba13dd3d2..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 7fef4fb6740..b04a5902678 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | £5.80 * | £0.06
+£7.20 | £5.80 * | £30.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 1c49a407507..5b9000e7a6d 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | -£35.72 * | £1,116.86
+£7.20 | -£35.72 * | £930.02
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 7810c2e4ad6..19f4f22c777 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £10.41
+£7.20 | £10.41
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/no.txt
index f913879d0f7..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index a4ee9007cbc..b026a49b3d3 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £18.07
+£7.20 | £18.07
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 3acc8b9d949..a86cc408763 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | -£44.21 * | £896.75
+£7.20 | -£44.21 * | £742.61
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 26e457844ea..0a3f7bce457 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £24.99
+£7.20 | £24.99
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index ba021270ed8..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 7f2bed5b5ec..7902cd5b7f1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £9.55
+£7.20 | £9.55
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 0097c175876..67d08ee058c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.80 | -£31.97 * | £1,015.99
+£7.20 | -£31.97 * | £848.77
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index 9c25bf5c472..ac7d573867b 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2009-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.80 | £14.16
+£7.20 | £14.16
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/no.txt
index 803e09eae0a..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index b6c4bb4b671..b3d9f3831fa 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £6.23
+£7.20 | £6.23 * | £13.98
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 69ca0f1fd17..21d86cf1620 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £4.22 * | £29.96
+£7.20 | £4.22 * | £43.02
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index 9369ec58e04..b898e75863e 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £6.46
+£7.20 | £6.46 * | £10.74
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index 803e09eae0a..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index fdaf0832038..17afefe5ddd 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £6.24
+£7.20 | £6.24 * | £20.84
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 8a11d712e7a..693dc80ee3b 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £4.90 * | £27.15
+£7.20 | £4.90 * | £49.88
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index aff4780e62b..b220940ff8a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £6.39
+£7.20 | £6.39 * | £17.60
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/no.txt
index e20b9e8d039..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 45265bed1c7..f3aa3125e91 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £18.73
+£7.20 | £18.73
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index e65e180e231..b91a966469a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £16.72
+£7.20 | £16.72
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index d095588b83d..cd608aac194 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £18.96
+£7.20 | £18.96
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index d141bb6a129..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index dc5c01e4220..dffd4cd91c6 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £9.99
+£7.20 | £9.99
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index e78c64c2833..d98b4ca73e0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £8.65
+£7.20 | £8.65
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 55f58dec1b1..1151ec4f4e5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £10.14
+£7.20 | £10.14
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/no.txt
index 803e09eae0a..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 36f775469c3..e87d9d64c85 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £5.71 * | £3.86
+£7.20 | £5.71 * | £21.52
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index afd57e3fef2..bce74157bb2 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | -£56.57 * | £1,096.17
+£7.20 | -£56.57 * | £921.16
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index 26f9258d563..8d55515c812 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £12.63
+£7.20 | £12.63
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index 803e09eae0a..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index cc1a5341814..c5ef1985c25 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | £5.89 * | £1.05
+£7.20 | £5.89 * | £28.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 9d587888b16..3460c9c6727 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | -£35.63 * | £1,093.36
+£7.20 | -£35.63 * | £928.02
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 70e4d6ce3cf..6b054261b79 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £10.50
+£7.20 | £10.50
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/no.txt
index e20b9e8d039..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 9cc39544177..80e4e96c229 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £18.21
+£7.20 | £18.21
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 93d0dfce283..5b2099d45eb 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | -£44.07 * | £876.94
+£7.20 | -£44.07 * | £740.60
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 36ae6563176..78b81d7b9e4 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £25.13
+£7.20 | £25.13
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index d141bb6a129..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 8aafa4ec3bf..94034aa6f78 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £9.64
+£7.20 | £9.64
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index adcd6c6b9bb..e313157da4d 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£5.93 | -£31.88 * | £994.71
+£7.20 | -£31.88 * | £846.77
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index 9dacd246904..2667661d65a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£5.93 | £14.25
+£7.20 | £14.25
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/no.txt
index 3ac30ed15ef..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 285b15ee9a6..3914f580cb6 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £6.24
+£7.20 | £6.24 * | £13.89
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index bd9f9429791..8e7a379d90a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £4.23 * | £31.70
+£7.20 | £4.23 * | £42.95
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index cd222f5f547..020ad91ea5c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £6.46
+£7.20 | £6.46 * | £10.67
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index 3ac30ed15ef..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 285b15ee9a6..7a7fef0a17f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £6.24
+£7.20 | £6.24 * | £20.75
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index ff4fc6640ff..c93fdfe3485 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £4.90 * | £30.24
+£7.20 | £4.90 * | £49.81
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index a611e1c4b48..3a73a2984a5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £6.39
+£7.20 | £6.39 * | £17.53
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/no.txt
index 4b82b845b5a..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index d9c99064db1..e4e8a735fce 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £18.74
+£7.20 | £18.74
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 95713064b9e..29930010564 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £16.73
+£7.20 | £16.73
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index 1b66a3310a3..cd608aac194 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £18.96
+£7.20 | £18.96
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index 6ae5ea4a0cf..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 7ba4fcd15d4..dffd4cd91c6 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £9.99
+£7.20 | £9.99
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index c8b4a9e18b2..d98b4ca73e0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £8.65
+£7.20 | £8.65
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 5eeb4e5b9bf..1151ec4f4e5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £10.14
+£7.20 | £10.14
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/no.txt
index 3ac30ed15ef..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 5704359ed28..647be25c00f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £5.88 * | £3.49
+£7.20 | £5.88 * | £19.12
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 3f55bec8604..dc989151a11 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | -£56.41 * | £1,068.84
+£7.20 | -£56.41 * | £918.76
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index d26767cc75d..2e9b40852bb 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £12.80
+£7.20 | £12.80
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index 3ac30ed15ef..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 7b16adb2728..90f0d76ba03 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | £6 * | £2.03
+£7.20 | £6 * | £25.98
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index dd189d47dbc..ba98a198405 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | -£35.52 * | £1,067.39
+£7.20 | -£35.52 * | £925.62
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 045bd49d418..56ac7dfc5b1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £10.61
+£7.20 | £10.61
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/no.txt
index 4b82b845b5a..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index d9ac833223e..3eadbd04534 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £18.38
+£7.20 | £18.38
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 831839992f0..52c0e5cc151 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | -£43.91 * | £855.03
+£7.20 | -£43.91 * | £738.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 9b75a388b3a..f5141ce2726 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £25.30
+£7.20 | £25.30
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index 6ae5ea4a0cf..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 595a3018121..03fee456cae 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £9.75
+£7.20 | £9.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 119b78921dc..50e83a136d5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.08 | -£31.77 * | £971.17
+£7.20 | -£31.77 * | £844.37
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index 8ceedc4646a..5ca969e852a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.08 | £14.36
+£7.20 | £14.36
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/no.txt
index c0746cbcfb2..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index a032ac58ff2..bbb003390cf 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6.24
+£7.20 | £6.24 * | £13.84
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 41873c4ca91..1e5745f2be4 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £4.23 * | £32.91
+£7.20 | £4.23 * | £42.88
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index fed9852f9ec..b7c1cdec3cf 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6.47
+£7.20 | £6.47 * | £10.61
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index c0746cbcfb2..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index a032ac58ff2..8bc91e75999 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6.24
+£7.20 | £6.24 * | £20.70
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index b8056cb8f94..caa30762bdc 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £4.90 * | £32.41
+£7.20 | £4.90 * | £49.74
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index 00e75ac3b18..e1f9c112d58 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6.39
+£7.20 | £6.39 * | £17.47
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/no.txt
index def08b5477f..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index e657dd796b0..e4e8a735fce 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £18.74
+£7.20 | £18.74
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 9925474bab6..29930010564 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £16.73
+£7.20 | £16.73
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index 4e941d16e2e..575a18455c5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £18.97
+£7.20 | £18.97
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index ede6c3e9129..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 4904b579e26..dffd4cd91c6 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £9.99
+£7.20 | £9.99
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index f19e349ac08..d98b4ca73e0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £8.65
+£7.20 | £8.65
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 32ee895ab30..1151ec4f4e5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £10.14
+£7.20 | £10.14
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/no.txt
index c0746cbcfb2..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6.25
+£7.20 | £6.25 * | £13.72
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index e414dee54b0..0bd92f657a0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6 * | £3.18
+£7.20 | £6 * | £17.32
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 01d0731ecad..2bd7341f710 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | -£56.28 * | £1,049.61
+£7.20 | -£56.28 * | £916.96
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index 3bc8cace6ed..a0023f311c0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £12.92
+£7.20 | £12.92
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index c0746cbcfb2..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6.25
+£7.20 | £6.25 * | £20.58
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index b7b6d4eb8cb..14217c5959b 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | £6.08 * | £2.68
+£7.20 | £6.08 * | £24.19
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index e68cfe9a218..09b0fc16562 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | -£35.44 * | £1,049.10
+£7.20 | -£35.44 * | £923.82
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index d99cf7dfa39..ad94adf862a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £10.70
+£7.20 | £10.70
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/no.txt
index def08b5477f..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 20d001bda2a..693f1828115 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £18.50
+£7.20 | £18.50
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 2504381b6a4..cfe6e3e51a1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | -£43.78 * | £839.59
+£7.20 | -£43.78 * | £736.40
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 090f1c2bd03..8ffc35b7219 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £25.42
+£7.20 | £25.42
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index ede6c3e9129..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index bea0c928177..e2a1cdfc824 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £9.83
+£7.20 | £9.83
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index a35943faf99..14fcb593619 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.19 | -£31.69 * | £954.60
+£7.20 | -£31.69 * | £842.57
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index c0d4ea5e57f..a584aaf5ea1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.19 | £14.45
+£7.20 | £14.45
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/no.txt
index a26559a89d8..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.25 * | £0.99
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index fdba6760c0a..c394d3fc6b1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.25 * | £1.05
+£7.20 | £6.25 * | £13.78
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 639f4c4b28c..42079f3c738 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £4.24 * | £34.20
+£7.20 | £4.24 * | £42.83
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index dd414c350cd..66ae00092ab 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.47
+£7.20 | £6.47 * | £10.55
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index 2937fe8710f..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.25 * | £1.48
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 9be3f695aaa..c5e3dfed0ab 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.25 * | £1.55
+£7.20 | £6.25 * | £20.64
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index b670cee09dc..e5abdaecd73 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £4.91 * | £34.69
+£7.20 | £4.91 * | £49.69
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index dfc85b9cee8..9156337f06f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -1,16 +1,16 @@
 
 
 $C
-You were paying the National Minimum Wage.
-
-You don’t owe the worker any past payments.
+You weren't paying the National Minimum Wage.
 $C
 
-The National Minimum Wage per hour at the time | The worker’s actual pay
+The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.40
+£7.20 | £6.40 * | £17.41
+
+\* This figure has been rounded to the nearest penny.
 
-If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
+This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
 This result is an estimate. If you have any questions, call the confidential helpline.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/no.txt
index d57b3e157d1..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index d57b3e157d1..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 33603631cc8..8cbf00954bb 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £16.74
+£7.20 | £16.74
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index 9b00a844243..575a18455c5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £18.97
+£7.20 | £18.97
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index 78d4d757e6c..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 78d4d757e6c..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 81a36530c6b..4e2b2623f27 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £8.66
+£7.20 | £8.66
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index da472b3c3f3..f3100268ab1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £10.15
+£7.20 | £10.15
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/no.txt
index a26559a89d8..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.25 * | £0.99
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index d1d4ed212ba..8eccc6fc8fe 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.13 * | £3.04
+£7.20 | £6.13 * | £15.52
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 66d9b54fdb4..edcc54e319f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | -£56.16 * | £1,029.58
+£7.20 | -£56.16 * | £915.16
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index c1e150d3d04..026d9242da7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £13.05
+£7.20 | £13.05
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index 2937fe8710f..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.25 * | £1.48
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index 74ccd7b5279..d54b0f32134 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | £6.17 * | £3.53
+£7.20 | £6.17 * | £22.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 2ad5d44b15d..978c86441fd 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | -£35.35 * | £1,030.07
+£7.20 | -£35.35 * | £922.03
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index 5c36ee1c847..a54afcdcb97 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £10.78
+£7.20 | £10.78
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/no.txt
index d57b3e157d1..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 4d7998d2d85..d4515ec5b51 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £18.63
+£7.20 | £18.63
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index ef5be9cfa65..2567134fc94 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | -£43.66 * | £823.55
+£7.20 | -£43.66 * | £734.61
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 5f7453f5a44..608b78fe2ce 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £25.55
+£7.20 | £25.55
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index 78d4d757e6c..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index 3009f778f8d..4d0cdbe6067 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £9.92
+£7.20 | £9.92
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 977ae89f3ce..c56c1396b6b 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.31 | -£31.61 * | £937.36
+£7.20 | -£31.61 * | £840.78
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index edce6c11cf4..a36ee00c79c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.31 | £14.53
+£7.20 | £14.53
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01.html
index 9a221b7d169..3dc683d5396 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no.html
index 000f9464472..4b1215c879d 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25.html
index 909f37ca416..420ff7d41cf 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1.html
index eb3148c902a..f9a21e07326 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/no.txt
index 2a2b4ace018..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
index 3d9fa934856..175f3c7d163 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 2a2b4ace018..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 709b4a1f20f..24034d5fb5c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £4.24 * | £36.12
+£7.20 | £4.24 * | £42.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
index 2583cf2f34b..d205e55f3ac 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
index 25f5641dd8c..70a61728bfb 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.0/yes_free/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.48 * | £0.37
+£7.20 | £6.48 * | £10.45
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.html
index 77a352d7288..114fae39966 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/0.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
index a6da5c5ea77..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index a6da5c5ea77..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index cadf13d00d3..26d8f84c11f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £4.91 * | £38.12
+£7.20 | £4.91 * | £49.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
index e394fd78c3f..eb0f2994fec 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.40 * | £2.37
+£7.20 | £6.40 * | £17.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.html
index 5cb98e87d0c..4af84cf2d94 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.0/8.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.html
index 6e6cd0fe05f..aecfb7784c2 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/100.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/no.txt
index 56dc711e7ca..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 56dc711e7ca..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 1ef1bdc822d..8cbf00954bb 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £16.74
+£7.20 | £16.74
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
index a58357f3848..360dde56a42 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £18.98
+£7.20 | £18.98
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
index ac7a6f5c8fb..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index ac7a6f5c8fb..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 47558367371..4e2b2623f27 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £8.66
+£7.20 | £8.66
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
index 6ac61fd3a29..f3100268ab1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £10.15
+£7.20 | £10.15
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.html
index 52d785363ba..f4508e4f492 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.html
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/1/16.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/no.txt
index 2a2b4ace018..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
index 2a2b4ace018..7a8f347a70f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.25 * | £4
+£7.20 | £6.25 * | £13.72
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 5cba8842f57..ff7b7f1d1fd 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | -£55.92 * | £998.75
+£7.20 | -£55.92 * | £911.76
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
index 04d1b6dfcbb..d34a13e441a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £13.28
+£7.20 | £13.28
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
index a6da5c5ea77..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/no.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
index a6da5c5ea77..4ce6262c51a 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | £6.25 * | £6
+£7.20 | £6.25 * | £20.58
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 1996bb47688..ef136f13df7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | -£35.20 * | £1,000.75
+£7.20 | -£35.20 * | £918.62
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
index b24a36b020a..6aba87cd8d0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/100.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £10.94
+£7.20 | £10.94
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/no.txt
index 56dc711e7ca..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
index 56dc711e7ca..4ca4b1c8608 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £18.75
+£7.20 | £18.75
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 700c7d601c9..2266540e7c4 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | -£43.42 * | £798.75
+£7.20 | -£43.42 * | £731.20
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
index 1e7d45f5c62..a3496adb3db 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/0.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £25.78
+£7.20 | £25.78
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
index ac7a6f5c8fb..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/no.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
index ac7a6f5c8fb..19862e7cdb5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/5.0/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £10
+£7.20 | £10
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 1435acd8d20..3594fb9599f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£6.50 | -£31.45 * | £910.75
+£7.20 | -£31.45 * | £837.37
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
index fe5f57adf2c..334734a1482 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2014-10-01/no/25/31/16.0/300.0/8.0/10.0/yes_free/5.txt
@@ -8,7 +8,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay
 - | -
-£6.50 | £14.69
+£7.20 | £14.69
 
 If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/y.html b/test/artefacts/minimum-wage-calculator-employers/y.html
index 8ea5debf494..91eec1dad29 100644
--- a/test/artefacts/minimum-wage-calculator-employers/y.html
+++ b/test/artefacts/minimum-wage-calculator-employers/y.html
@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
     <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>National Minimum Wage calculator for employers - GOV.UK</title>
+    <title>Minimum wage calculator for employers - GOV.UK</title>
     <script src="/smartanswers/smart-answers.js" defer="defer"></script>
     <meta name="robots" content="noindex">
 
@@ -22,7 +22,7 @@
   <header class="page-header group">
     <div>
       <h1>
-        National Minimum Wage calculator for employers
+        Minimum wage calculator for employers
       </h1>
     </div>
   </header>
@@ -43,7 +43,7 @@ <h2>
     <li>
       <label for="response_0" class="selectable">
         <input type="radio" name="response" id="response_0" value="current_payment" />
-        If you’re paying a worker the National Wage (from October 2015)
+        If you’re paying a worker the National Minimum Wage (from October 2015) or the National Living Wage (from April 2016)
       </label>
     </li>
     <li>
diff --git a/test/data/am-i-getting-minimum-wage-files.yml b/test/data/am-i-getting-minimum-wage-files.yml
index 0d9f0967a09..69fc9d1652f 100644
--- a/test/data/am-i-getting-minimum-wage-files.yml
+++ b/test/data/am-i-getting-minimum-wage-files.yml
@@ -1,11 +1,10 @@
 ---
-lib/smart_answer_flows/am-i-getting-minimum-wage.rb: 819e8a61d4e82ebe173fae07895d476a
-test/data/am-i-getting-minimum-wage-questions-and-responses.yml: 212c0b6343d812ba81b18cb940bfba35
-test/data/am-i-getting-minimum-wage-responses-and-expected-results.yml: ee1cc2d8ee436f03a31203c4dbc3ef70
-lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb: e3bad2e005bb806999594e9f87f5e5ae
-lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb: e8017c705ee7f7f6bd2c25b3ac620070
-lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb: fa996b65f6030318fdb04aa59571f1dc
-lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/does_not_apply_to_first_year_apprentices.govspeak.erb: fb80102faf5304ff5c9bb11d1273a95a
+lib/smart_answer_flows/am-i-getting-minimum-wage.rb: 77e4f172fa2cbd3409511a734c11323d
+test/data/am-i-getting-minimum-wage-questions-and-responses.yml: 15d3d0f3ab85e497f979121c293899cd
+test/data/am-i-getting-minimum-wage-responses-and-expected-results.yml: 8373d2413e234765ff9671afd45363e6
+lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.govspeak.erb: 86c93ffa61a92bfd386e0e9f2957ac4c
+lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb: 0307275df2e8913676fb967ffe0f0655
+lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb: 55a7da0fe47e873c1b01d6a631c9b67b
 lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/does_not_apply_to_historical_apprentices.govspeak.erb: bd846fa5585f32e995c74bb714f6d600
 lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_above.govspeak.erb: 318fe01cfb0eeb99fca8f5a23a9b7e01
 lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_below.govspeak.erb: e679611c055022d61e36930c56fcaff0
@@ -22,7 +21,7 @@ lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_are_you_paid
 lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_were_you_paid_during_pay_period.govspeak.erb: c6abaebfaae248fd3693ba2e1beab5d3
 lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_did_you_get_paid.govspeak.erb: 868f39331c513af521803a73a44d61ad
 lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_do_you_get_paid.govspeak.erb: 7c8cfebb76f688bfb03c3625cd413a24
-lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.govspeak.erb: 63448299e27159f03d1d91b90aff86c1
+lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.govspeak.erb: 9d71f5503c82bb150961f8537453cce5
 lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_were_you.govspeak.erb: bfd909f04f6d523614226a0f9b8e7ea5
 lib/smart_answer_flows/am-i-getting-minimum-wage/questions/is_provided_with_accommodation.govspeak.erb: 083f1e522ae617d0aacf6851479ef28c
 lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_charge.govspeak.erb: 9278d1a8b2bf2d3979fb744902c8e9ef
@@ -32,9 +31,8 @@ lib/smart_answer_flows/am-i-getting-minimum-wage/questions/was_provided_with_acc
 lib/smart_answer_flows/am-i-getting-minimum-wage/questions/were_you_an_apprentice.govspeak.erb: 301ea07f6a6ad55cbaaefd8d3ad3c181
 lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_is_overtime_pay_per_hour.govspeak.erb: d9083c3da82c3f5754f7bdd9394e7d4f
 lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_was_overtime_pay_per_hour.govspeak.erb: 38abdccc0f2f10e6e56837336f4143bb
-lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.govspeak.erb: c3ae31e57b1f5d78a30c08ed6e22f245
-lib/smart_answer_flows/am-i-getting-minimum-wage/questions/will_you_be_a_first_year_apprentice.govspeak.erb: 524767101e41ecf9a65e030adb1141f9
+lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.govspeak.erb: 4464c125747d87fee69b7498c9617f85
 lib/smart_answer_flows/shared/minimum_wage/_acas_information.govspeak.erb: 582cdf982fa5619072ddd883bf4c1555
 lib/smart_answer_flows/shared_logic/minimum_wage.rb: d27e8aa03ebf55901c24d39118ebef62
-lib/smart_answer/calculators/minimum_wage_calculator.rb: f12e8aa4630065b6bdc65a5ae4564f8e
+lib/smart_answer/calculators/minimum_wage_calculator.rb: a738d3f7bd5263b1e3e138711ead919c
 lib/data/minimum_wage_data.yml: ff0204584fe4e0672370fda487121915
diff --git a/test/data/am-i-getting-minimum-wage-questions-and-responses.yml b/test/data/am-i-getting-minimum-wage-questions-and-responses.yml
index 7b076d602f0..f0334f6e3e4 100644
--- a/test/data/am-i-getting-minimum-wage-questions-and-responses.yml
+++ b/test/data/am-i-getting-minimum-wage-questions-and-responses.yml
@@ -2,7 +2,6 @@
 :what_would_you_like_to_check?:
 - current_payment
 - past_payment
-- current_payment_april_2016
 :past_payment_date?:
 - '2014-10-01'
 - '2013-10-01'
@@ -16,15 +15,13 @@
 - apprentice_under_19
 - apprentice_over_19_first_year
 - apprentice_over_19_second_year_onwards
-:will_you_be_a_first_year_apprentice?:
-- 'no'
-- 'yes'
 :were_you_an_apprentice?:
 - 'no'
 - apprentice_under_19
 - apprentice_over_19
 :how_old_are_you?:
 - 15
+- 24
 - 25
 :how_old_were_you?:
 - 15
diff --git a/test/data/am-i-getting-minimum-wage-responses-and-expected-results.yml b/test/data/am-i-getting-minimum-wage-responses-and-expected-results.yml
index c582a992446..613477095f6 100644
--- a/test/data/am-i-getting-minimum-wage-responses-and-expected-results.yml
+++ b/test/data/am-i-getting-minimum-wage-responses-and-expected-results.yml
@@ -21,14 +21,14 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   :next_node: :how_often_do_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_do_you_get_paid?
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
@@ -36,7 +36,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16'
   :next_node: :how_much_are_you_paid_during_pay_period?
@@ -45,7 +45,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100'
@@ -55,7 +55,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -66,7 +66,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -78,7 +78,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -90,7 +90,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -103,7 +103,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -115,7 +115,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -128,7 +128,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -142,7 +142,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -155,7 +155,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -169,7 +169,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -180,7 +180,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -192,7 +192,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -205,7 +205,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -218,7 +218,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -232,7 +232,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -245,7 +245,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -259,7 +259,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -274,7 +274,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -288,7 +288,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -303,7 +303,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300'
@@ -313,7 +313,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -324,7 +324,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -336,7 +336,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -348,7 +348,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -361,7 +361,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -373,7 +373,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -386,7 +386,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -400,7 +400,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -413,7 +413,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -427,7 +427,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -438,7 +438,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -450,7 +450,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -463,7 +463,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -476,7 +476,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -490,7 +490,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -503,7 +503,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -517,7 +517,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -532,7 +532,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -546,7 +546,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '1'
   - '16.0'
   - '300.0'
@@ -561,7 +561,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
@@ -569,7 +569,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16'
   :next_node: :how_much_are_you_paid_during_pay_period?
@@ -578,7 +578,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100'
@@ -588,7 +588,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -599,7 +599,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -611,7 +611,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -623,7 +623,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -636,7 +636,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -648,7 +648,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -661,7 +661,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -675,7 +675,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -688,7 +688,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -702,7 +702,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -713,7 +713,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -725,7 +725,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -738,7 +738,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -751,7 +751,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -765,7 +765,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -778,7 +778,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -792,7 +792,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -807,7 +807,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -821,7 +821,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '100.0'
@@ -836,7 +836,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300'
@@ -846,7 +846,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -857,7 +857,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -869,7 +869,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -881,7 +881,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -894,7 +894,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -906,7 +906,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -919,7 +919,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -933,7 +933,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -946,7 +946,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -960,7 +960,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -971,7 +971,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -983,7 +983,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -996,7 +996,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -1009,7 +1009,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -1023,7 +1023,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -1036,7 +1036,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -1050,7 +1050,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -1065,7 +1065,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -1079,7 +1079,7 @@
   :responses:
   - current_payment
   - not_an_apprentice
-  - '25'
+  - '24'
   - '31'
   - '16.0'
   - '300.0'
@@ -1090,23 +1090,26 @@
   - '5'
   :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :are_you_an_apprentice?
+- :current_node: :how_old_are_you?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   :next_node: :how_often_do_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_do_you_get_paid?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16'
   :next_node: :how_much_are_you_paid_during_pay_period?
@@ -1114,7 +1117,8 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100'
@@ -1123,7 +1127,8 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1133,18 +1138,20 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1155,19 +1162,21 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1178,7 +1187,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1190,7 +1200,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1198,12 +1209,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1215,7 +1227,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1223,12 +1236,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1238,7 +1252,8 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1249,19 +1264,21 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1273,7 +1290,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1281,12 +1299,13 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1298,7 +1317,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1311,7 +1331,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1320,12 +1341,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1338,7 +1360,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -1347,12 +1370,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300'
@@ -1361,7 +1385,8 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1371,7 +1396,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1382,7 +1408,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1393,7 +1420,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1405,7 +1433,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1416,7 +1445,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1428,7 +1458,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1441,7 +1472,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1453,7 +1485,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1466,7 +1499,8 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1476,7 +1510,8 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1487,7 +1522,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1499,7 +1535,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1511,7 +1548,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1524,7 +1562,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1536,7 +1575,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1549,7 +1589,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1563,7 +1604,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1576,7 +1618,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -1590,14 +1633,16 @@
 - :current_node: :how_often_do_you_get_paid?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16'
   :next_node: :how_much_are_you_paid_during_pay_period?
@@ -1605,7 +1650,8 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100'
@@ -1614,7 +1660,8 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1624,18 +1671,20 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1646,7 +1695,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1658,7 +1708,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1669,7 +1720,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1681,7 +1733,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1689,12 +1742,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1706,7 +1760,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1719,7 +1774,8 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1729,7 +1785,8 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1740,19 +1797,21 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1764,7 +1823,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1777,7 +1837,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1789,7 +1850,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1802,7 +1864,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1811,12 +1874,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :current_payment_below
   :outcome_node: true
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1829,7 +1893,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -1843,7 +1908,8 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300'
@@ -1852,7 +1918,8 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1862,7 +1929,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1873,7 +1941,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1884,7 +1953,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1896,7 +1966,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1907,7 +1978,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1919,7 +1991,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1932,7 +2005,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1944,7 +2018,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1957,7 +2032,8 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1967,7 +2043,8 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1978,7 +2055,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -1990,7 +2068,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -2002,7 +2081,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -2015,7 +2095,8 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -2027,7 +2108,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -2040,7 +2122,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -2054,7 +2137,8 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -2067,7 +2151,8 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_under_19
+  - not_an_apprentice
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -2081,20 +2166,20 @@
 - :current_node: :are_you_an_apprentice?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   :next_node: :how_often_do_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_do_you_get_paid?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16'
   :next_node: :how_much_are_you_paid_during_pay_period?
@@ -2102,7 +2187,7 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100'
@@ -2111,7 +2196,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2121,7 +2206,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2132,7 +2217,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2143,7 +2228,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2155,7 +2240,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2166,7 +2251,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2178,7 +2263,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2191,7 +2276,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2203,7 +2288,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2216,7 +2301,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2226,7 +2311,7 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2237,7 +2322,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2249,7 +2334,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2261,7 +2346,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2274,7 +2359,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2286,7 +2371,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2299,7 +2384,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2313,7 +2398,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2326,7 +2411,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -2340,7 +2425,7 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300'
@@ -2349,7 +2434,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2359,7 +2444,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2370,7 +2455,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2381,7 +2466,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2393,7 +2478,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2404,7 +2489,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2416,7 +2501,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2429,7 +2514,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2441,7 +2526,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2454,7 +2539,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2464,7 +2549,7 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2475,7 +2560,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2487,7 +2572,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2499,7 +2584,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2512,7 +2597,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2524,7 +2609,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2537,7 +2622,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2551,7 +2636,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2564,7 +2649,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -2578,14 +2663,14 @@
 - :current_node: :how_often_do_you_get_paid?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16'
   :next_node: :how_much_are_you_paid_during_pay_period?
@@ -2593,7 +2678,7 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100'
@@ -2602,7 +2687,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2612,7 +2697,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2623,7 +2708,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2634,7 +2719,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2646,7 +2731,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2657,7 +2742,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2669,7 +2754,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2682,7 +2767,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2694,7 +2779,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2707,7 +2792,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2717,7 +2802,7 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2728,7 +2813,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2740,7 +2825,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2752,7 +2837,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2765,7 +2850,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2777,7 +2862,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2790,7 +2875,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2804,7 +2889,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2817,7 +2902,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -2831,7 +2916,7 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300'
@@ -2840,7 +2925,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2850,7 +2935,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2861,7 +2946,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2872,7 +2957,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2884,7 +2969,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2895,7 +2980,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2907,7 +2992,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2920,7 +3005,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2932,7 +3017,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2945,7 +3030,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2955,7 +3040,7 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2966,7 +3051,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2978,7 +3063,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -2990,7 +3075,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -3003,7 +3088,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -3015,7 +3100,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -3028,7 +3113,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -3042,7 +3127,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -3055,7 +3140,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_first_year
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -3069,36 +3154,20 @@
 - :current_node: :are_you_an_apprentice?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  :next_node: :how_old_are_you?
-  :outcome_node: false
-- :current_node: :how_old_are_you?
-  :responses:
-  - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '15'
-  :next_node: :under_school_leaving_age
-  :outcome_node: true
-- :current_node: :how_old_are_you?
-  :responses:
-  - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   :next_node: :how_often_do_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_do_you_get_paid?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16'
   :next_node: :how_much_are_you_paid_during_pay_period?
@@ -3106,8 +3175,7 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100'
@@ -3116,8 +3184,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3127,20 +3194,18 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3151,21 +3216,19 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3176,8 +3239,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3189,8 +3251,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3198,13 +3259,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3216,8 +3276,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3225,13 +3284,12 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3241,8 +3299,7 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3253,21 +3310,19 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3279,8 +3334,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3288,13 +3342,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3306,8 +3359,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3320,8 +3372,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3330,13 +3381,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3349,8 +3399,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '100.0'
@@ -3359,13 +3408,12 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300'
@@ -3374,8 +3422,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3385,8 +3432,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3397,8 +3443,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3409,8 +3454,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3422,8 +3466,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3434,8 +3477,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3447,8 +3489,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3461,8 +3502,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3474,8 +3514,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3488,8 +3527,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3499,8 +3537,7 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3511,8 +3548,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3524,8 +3560,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3537,8 +3572,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3551,8 +3585,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3564,8 +3597,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3578,8 +3610,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3593,8 +3624,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3607,8 +3637,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '1'
   - '16.0'
   - '300.0'
@@ -3622,16 +3651,14 @@
 - :current_node: :how_often_do_you_get_paid?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16'
   :next_node: :how_much_are_you_paid_during_pay_period?
@@ -3639,8 +3666,7 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100'
@@ -3649,8 +3675,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3660,20 +3685,18 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3684,8 +3707,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3697,8 +3719,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3709,8 +3730,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3722,8 +3742,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3731,13 +3750,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3749,8 +3767,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3763,8 +3780,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3774,8 +3790,7 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3786,21 +3801,19 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3812,8 +3825,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3826,8 +3838,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3839,8 +3850,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3853,8 +3863,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3863,13 +3872,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :current_payment_above
   :outcome_node: true
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3882,8 +3890,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '100.0'
@@ -3897,8 +3904,7 @@
 - :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300'
@@ -3907,8 +3913,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -3918,8 +3923,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -3930,8 +3934,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -3942,8 +3945,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -3955,8 +3957,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -3967,8 +3968,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -3980,8 +3980,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -3994,8 +3993,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4007,8 +4005,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4021,8 +4018,7 @@
 - :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4032,8 +4028,7 @@
 - :current_node: :what_is_overtime_pay_per_hour?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4044,8 +4039,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4057,8 +4051,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4070,8 +4063,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4084,8 +4076,7 @@
 - :current_node: :is_provided_with_accommodation?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4097,8 +4088,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4111,8 +4101,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4126,8 +4115,7 @@
 - :current_node: :current_accommodation_charge?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4140,8 +4128,7 @@
 - :current_node: :current_accommodation_usage?
   :responses:
   - current_payment
-  - apprentice_over_19_second_year_onwards
-  - '25'
+  - apprentice_over_19_first_year
   - '31'
   - '16.0'
   - '300.0'
@@ -4152,155 +4139,131 @@
   - '5'
   :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :what_would_you_like_to_check?
-  :responses:
-  - past_payment
-  :next_node: :past_payment_date?
-  :outcome_node: false
-- :current_node: :past_payment_date?
-  :responses:
-  - past_payment
-  - '2014-10-01'
-  :next_node: :were_you_an_apprentice?
-  :outcome_node: false
-- :current_node: :were_you_an_apprentice?
+- :current_node: :are_you_an_apprentice?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  :next_node: :how_old_were_you?
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  :next_node: :how_old_are_you?
   :outcome_node: false
-- :current_node: :how_old_were_you?
+- :current_node: :how_old_are_you?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '15'
-  :next_node: :under_school_leaving_age_past
+  :next_node: :under_school_leaving_age
   :outcome_node: true
-- :current_node: :how_old_were_you?
+- :current_node: :how_old_are_you?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
-  :next_node: :how_often_did_you_get_paid?
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  :next_node: :how_often_do_you_get_paid?
   :outcome_node: false
-- :current_node: :how_often_did_you_get_paid?
+- :current_node: :how_often_do_you_get_paid?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
-  :next_node: :how_many_hours_did_you_work?
+  :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_did_you_work?
+- :current_node: :how_many_hours_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16'
-  :next_node: :how_much_were_you_paid_during_pay_period?
+  :next_node: :how_much_are_you_paid_during_pay_period?
   :outcome_node: false
-- :current_node: :how_much_were_you_paid_during_pay_period?
+- :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100'
-  :next_node: :how_many_hours_overtime_did_you_work?
+  :next_node: :how_many_hours_overtime_do_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_overtime_did_you_work?
+- :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '0'
-  :next_node: :was_provided_with_accommodation?
+  :next_node: :is_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_charged
-  :next_node: :past_accommodation_charge?
+  :next_node: :current_accommodation_charge?
   :outcome_node: false
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_charged
   - '5'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -4308,28 +4271,26 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_charged
   - '50'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
@@ -4337,66 +4298,1134 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :how_many_hours_overtime_did_you_work?
+- :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '8'
-  :next_node: :what_was_overtime_pay_per_hour?
+  :next_node: :what_is_overtime_pay_per_hour?
   :outcome_node: false
-- :current_node: :what_was_overtime_pay_per_hour?
+- :current_node: :what_is_overtime_pay_per_hour?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10'
-  :next_node: :was_provided_with_accommodation?
+  :next_node: :is_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
-  - '25'
-  - '1'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_free
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_free
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  :next_node: :current_accommodation_charge?
+  :outcome_node: false
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '5'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '5.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '50'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '50.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :how_much_are_you_paid_during_pay_period?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300'
+  :next_node: :how_many_hours_overtime_do_you_work?
+  :outcome_node: false
+- :current_node: :how_many_hours_overtime_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '0'
+  :next_node: :is_provided_with_accommodation?
+  :outcome_node: false
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - 'no'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_free
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_free
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  :next_node: :current_accommodation_charge?
+  :outcome_node: false
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  - '5'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  - '5.0'
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  - '50'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  - '50.0'
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :how_many_hours_overtime_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8'
+  :next_node: :what_is_overtime_pay_per_hour?
+  :outcome_node: false
+- :current_node: :what_is_overtime_pay_per_hour?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10'
+  :next_node: :is_provided_with_accommodation?
+  :outcome_node: false
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - 'no'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_free
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_free
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  :next_node: :current_accommodation_charge?
+  :outcome_node: false
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '5'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '5.0'
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '50'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '1'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '50.0'
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :how_often_do_you_get_paid?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  :next_node: :how_many_hours_do_you_work?
+  :outcome_node: false
+- :current_node: :how_many_hours_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16'
+  :next_node: :how_much_are_you_paid_during_pay_period?
+  :outcome_node: false
+- :current_node: :how_much_are_you_paid_during_pay_period?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100'
+  :next_node: :how_many_hours_overtime_do_you_work?
+  :outcome_node: false
+- :current_node: :how_many_hours_overtime_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '0'
+  :next_node: :is_provided_with_accommodation?
+  :outcome_node: false
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - 'no'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_free
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_free
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  :next_node: :current_accommodation_charge?
+  :outcome_node: false
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  - '5'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  - '5.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  - '50'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  - '50.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :how_many_hours_overtime_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8'
+  :next_node: :what_is_overtime_pay_per_hour?
+  :outcome_node: false
+- :current_node: :what_is_overtime_pay_per_hour?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10'
+  :next_node: :is_provided_with_accommodation?
+  :outcome_node: false
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - 'no'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_free
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_free
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  :next_node: :current_accommodation_charge?
+  :outcome_node: false
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '5'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '5.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '50'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '50.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :how_much_are_you_paid_during_pay_period?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300'
+  :next_node: :how_many_hours_overtime_do_you_work?
+  :outcome_node: false
+- :current_node: :how_many_hours_overtime_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '0'
+  :next_node: :is_provided_with_accommodation?
+  :outcome_node: false
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - 'no'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_free
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_free
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  :next_node: :current_accommodation_charge?
+  :outcome_node: false
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  - '5'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  - '5.0'
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  - '50'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '0.0'
+  - yes_charged
+  - '50.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :how_many_hours_overtime_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8'
+  :next_node: :what_is_overtime_pay_per_hour?
+  :outcome_node: false
+- :current_node: :what_is_overtime_pay_per_hour?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10'
+  :next_node: :is_provided_with_accommodation?
+  :outcome_node: false
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - 'no'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_free
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_free
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  :next_node: :current_accommodation_charge?
+  :outcome_node: false
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '5'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '5.0'
+  - '5'
+  :next_node: :current_payment_above
+  :outcome_node: true
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '50'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '24'
+  - '31'
+  - '16.0'
+  - '300.0'
+  - '8.0'
+  - '10.0'
+  - yes_charged
+  - '50.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :how_old_are_you?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  :next_node: :how_often_do_you_get_paid?
+  :outcome_node: false
+- :current_node: :how_often_do_you_get_paid?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  :next_node: :how_many_hours_do_you_work?
+  :outcome_node: false
+- :current_node: :how_many_hours_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16'
+  :next_node: :how_much_are_you_paid_during_pay_period?
+  :outcome_node: false
+- :current_node: :how_much_are_you_paid_during_pay_period?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100'
+  :next_node: :how_many_hours_overtime_do_you_work?
+  :outcome_node: false
+- :current_node: :how_many_hours_overtime_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '0'
+  :next_node: :is_provided_with_accommodation?
+  :outcome_node: false
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - 'no'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_free
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_free
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  :next_node: :current_accommodation_charge?
+  :outcome_node: false
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  - '5'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  - '5.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :current_accommodation_charge?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  - '50'
+  :next_node: :current_accommodation_usage?
+  :outcome_node: false
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '0.0'
+  - yes_charged
+  - '50.0'
+  - '5'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :how_many_hours_overtime_do_you_work?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8'
+  :next_node: :what_is_overtime_pay_per_hour?
+  :outcome_node: false
+- :current_node: :what_is_overtime_pay_per_hour?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10'
+  :next_node: :is_provided_with_accommodation?
+  :outcome_node: false
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
+  - '16.0'
+  - '100.0'
+  - '8.0'
+  - '10.0'
+  - 'no'
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :is_provided_with_accommodation?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
+  - '25'
+  - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - yes_free
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4405,13 +5434,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4419,13 +5447,12 @@
   - '8.0'
   - '10.0'
   - yes_charged
-  :next_node: :past_accommodation_charge?
+  :next_node: :current_accommodation_charge?
   :outcome_node: false
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4434,13 +5461,12 @@
   - '10.0'
   - yes_charged
   - '5'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4450,13 +5476,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4465,13 +5490,12 @@
   - '10.0'
   - yes_charged
   - '50'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4481,62 +5505,57 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :how_much_were_you_paid_during_pay_period?
+- :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
   - '300'
-  :next_node: :how_many_hours_overtime_did_you_work?
+  :next_node: :how_many_hours_overtime_do_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_overtime_did_you_work?
+- :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
   - '300.0'
   - '0'
-  :next_node: :was_provided_with_accommodation?
+  :next_node: :is_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
   - '300.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
   - '300.0'
   - '0.0'
   - yes_free
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4544,26 +5563,24 @@
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
   - '300.0'
   - '0.0'
   - yes_charged
-  :next_node: :past_accommodation_charge?
+  :next_node: :current_accommodation_charge?
   :outcome_node: false
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4571,13 +5588,12 @@
   - '0.0'
   - yes_charged
   - '5'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
-  :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+- :current_node: :current_accommodation_usage?
+  :responses:
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4586,13 +5602,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4600,13 +5615,12 @@
   - '0.0'
   - yes_charged
   - '50'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4615,38 +5629,35 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :how_many_hours_overtime_did_you_work?
+- :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
   - '300.0'
   - '8'
-  :next_node: :what_was_overtime_pay_per_hour?
+  :next_node: :what_is_overtime_pay_per_hour?
   :outcome_node: false
-- :current_node: :what_was_overtime_pay_per_hour?
+- :current_node: :what_is_overtime_pay_per_hour?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
   - '300.0'
   - '8.0'
   - '10'
-  :next_node: :was_provided_with_accommodation?
+  :next_node: :is_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4654,13 +5665,12 @@
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4668,13 +5678,12 @@
   - '8.0'
   - '10.0'
   - yes_free
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4683,13 +5692,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4697,13 +5705,12 @@
   - '8.0'
   - '10.0'
   - yes_charged
-  :next_node: :past_accommodation_charge?
+  :next_node: :current_accommodation_charge?
   :outcome_node: false
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4712,13 +5719,12 @@
   - '10.0'
   - yes_charged
   - '5'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4728,13 +5734,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4743,13 +5748,12 @@
   - '10.0'
   - yes_charged
   - '50'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '1'
   - '16.0'
@@ -4759,81 +5763,74 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :how_often_did_you_get_paid?
+- :current_node: :how_often_do_you_get_paid?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
-  :next_node: :how_many_hours_did_you_work?
+  :next_node: :how_many_hours_do_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_did_you_work?
+- :current_node: :how_many_hours_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16'
-  :next_node: :how_much_were_you_paid_during_pay_period?
+  :next_node: :how_much_are_you_paid_during_pay_period?
   :outcome_node: false
-- :current_node: :how_much_were_you_paid_during_pay_period?
+- :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '100'
-  :next_node: :how_many_hours_overtime_did_you_work?
+  :next_node: :how_many_hours_overtime_do_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_overtime_did_you_work?
+- :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0'
-  :next_node: :was_provided_with_accommodation?
+  :next_node: :is_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -4841,26 +5838,24 @@
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_charged
-  :next_node: :past_accommodation_charge?
+  :next_node: :current_accommodation_charge?
   :outcome_node: false
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -4868,13 +5863,12 @@
   - '0.0'
   - yes_charged
   - '5'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -4883,13 +5877,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -4897,13 +5890,12 @@
   - '0.0'
   - yes_charged
   - '50'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -4912,38 +5904,35 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :how_many_hours_overtime_did_you_work?
+- :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '8'
-  :next_node: :what_was_overtime_pay_per_hour?
+  :next_node: :what_is_overtime_pay_per_hour?
   :outcome_node: false
-- :current_node: :what_was_overtime_pay_per_hour?
+- :current_node: :what_is_overtime_pay_per_hour?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10'
-  :next_node: :was_provided_with_accommodation?
+  :next_node: :is_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -4951,13 +5940,12 @@
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -4965,13 +5953,12 @@
   - '8.0'
   - '10.0'
   - yes_free
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -4980,13 +5967,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -4994,13 +5980,12 @@
   - '8.0'
   - '10.0'
   - yes_charged
-  :next_node: :past_accommodation_charge?
+  :next_node: :current_accommodation_charge?
   :outcome_node: false
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5009,13 +5994,12 @@
   - '10.0'
   - yes_charged
   - '5'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5025,13 +6009,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5040,13 +6023,12 @@
   - '10.0'
   - yes_charged
   - '50'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5056,62 +6038,57 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :how_much_were_you_paid_during_pay_period?
+- :current_node: :how_much_are_you_paid_during_pay_period?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '300'
-  :next_node: :how_many_hours_overtime_did_you_work?
+  :next_node: :how_many_hours_overtime_do_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_overtime_did_you_work?
+- :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '300.0'
   - '0'
-  :next_node: :was_provided_with_accommodation?
+  :next_node: :is_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '300.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '300.0'
   - '0.0'
   - yes_free
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5119,26 +6096,24 @@
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '300.0'
   - '0.0'
   - yes_charged
-  :next_node: :past_accommodation_charge?
+  :next_node: :current_accommodation_charge?
   :outcome_node: false
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5146,13 +6121,12 @@
   - '0.0'
   - yes_charged
   - '5'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5161,13 +6135,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5175,13 +6148,12 @@
   - '0.0'
   - yes_charged
   - '50'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5190,38 +6162,35 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
   :outcome_node: true
-- :current_node: :how_many_hours_overtime_did_you_work?
+- :current_node: :how_many_hours_overtime_do_you_work?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '300.0'
   - '8'
-  :next_node: :what_was_overtime_pay_per_hour?
+  :next_node: :what_is_overtime_pay_per_hour?
   :outcome_node: false
-- :current_node: :what_was_overtime_pay_per_hour?
+- :current_node: :what_is_overtime_pay_per_hour?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
   - '300.0'
   - '8.0'
   - '10'
-  :next_node: :was_provided_with_accommodation?
+  :next_node: :is_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5229,13 +6198,12 @@
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5243,13 +6211,12 @@
   - '8.0'
   - '10.0'
   - yes_free
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5258,13 +6225,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :was_provided_with_accommodation?
+- :current_node: :is_provided_with_accommodation?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5272,13 +6238,12 @@
   - '8.0'
   - '10.0'
   - yes_charged
-  :next_node: :past_accommodation_charge?
+  :next_node: :current_accommodation_charge?
   :outcome_node: false
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5287,13 +6252,12 @@
   - '10.0'
   - yes_charged
   - '5'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5303,13 +6267,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :current_payment_above
   :outcome_node: true
-- :current_node: :past_accommodation_charge?
+- :current_node: :current_accommodation_charge?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5318,13 +6281,12 @@
   - '10.0'
   - yes_charged
   - '50'
-  :next_node: :past_accommodation_usage?
+  :next_node: :current_accommodation_usage?
   :outcome_node: false
-- :current_node: :past_accommodation_usage?
+- :current_node: :current_accommodation_usage?
   :responses:
-  - past_payment
-  - '2014-10-01'
-  - 'no'
+  - current_payment
+  - apprentice_over_19_second_year_onwards
   - '25'
   - '31'
   - '16.0'
@@ -5334,20 +6296,48 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :current_payment_below
+  :outcome_node: true
+- :current_node: :what_would_you_like_to_check?
+  :responses:
+  - past_payment
+  :next_node: :past_payment_date?
+  :outcome_node: false
+- :current_node: :past_payment_date?
+  :responses:
+  - past_payment
+  - '2014-10-01'
+  :next_node: :were_you_an_apprentice?
+  :outcome_node: false
+- :current_node: :were_you_an_apprentice?
+  :responses:
+  - past_payment
+  - '2014-10-01'
+  - 'no'
+  :next_node: :how_old_were_you?
+  :outcome_node: false
+- :current_node: :how_old_were_you?
+  :responses:
+  - past_payment
+  - '2014-10-01'
+  - 'no'
+  - '15'
+  :next_node: :under_school_leaving_age_past
   :outcome_node: true
-- :current_node: :were_you_an_apprentice?
+- :current_node: :how_old_were_you?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -5355,7 +6345,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -5364,7 +6355,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100'
@@ -5374,7 +6366,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5385,19 +6378,21 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5409,20 +6404,22 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5434,7 +6431,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5447,7 +6445,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5455,13 +6454,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5474,7 +6474,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5482,13 +6483,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5499,7 +6501,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5511,20 +6514,22 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5537,7 +6542,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5545,13 +6551,14 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5564,7 +6571,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5578,7 +6586,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5587,13 +6596,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5607,7 +6617,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -5616,13 +6627,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300'
@@ -5632,7 +6644,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5643,7 +6656,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5655,7 +6669,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5667,7 +6682,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5680,7 +6696,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5692,7 +6709,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5705,7 +6723,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5719,7 +6738,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5732,7 +6752,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5746,7 +6767,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5757,7 +6779,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5769,7 +6792,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5782,7 +6806,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5795,7 +6820,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5809,7 +6835,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5822,7 +6849,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5836,7 +6864,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5851,7 +6880,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5865,7 +6895,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -5880,7 +6911,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -5888,7 +6920,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -5897,7 +6930,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100'
@@ -5907,7 +6941,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -5918,19 +6953,21 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -5942,7 +6979,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -5955,7 +6993,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -5967,7 +7006,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -5980,7 +7020,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -5988,13 +7029,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6007,7 +7049,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6021,7 +7064,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6032,7 +7076,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6044,20 +7089,22 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6070,7 +7117,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6084,7 +7132,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6097,7 +7146,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6111,7 +7161,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6120,13 +7171,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6140,7 +7192,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -6155,7 +7208,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300'
@@ -6165,7 +7219,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6176,7 +7231,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6188,7 +7244,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6200,7 +7257,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6213,7 +7271,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6225,7 +7284,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6238,7 +7298,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6252,7 +7313,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6265,7 +7327,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6279,7 +7342,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6290,7 +7354,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6302,7 +7367,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6315,7 +7381,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6328,7 +7395,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6342,7 +7410,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6355,7 +7424,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6369,7 +7439,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6384,7 +7455,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6398,7 +7470,8 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -6413,14 +7486,14 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -6428,7 +7501,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -6437,7 +7510,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100'
@@ -6447,7 +7520,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6458,7 +7531,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6470,7 +7543,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6482,7 +7555,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6495,7 +7568,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6507,7 +7580,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6520,7 +7593,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6534,7 +7607,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6547,7 +7620,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6561,7 +7634,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6572,7 +7645,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6584,7 +7657,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6597,7 +7670,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6610,7 +7683,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6624,7 +7697,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6637,7 +7710,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6651,7 +7724,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6666,7 +7739,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6680,7 +7753,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -6695,7 +7768,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300'
@@ -6705,7 +7778,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6716,7 +7789,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6728,7 +7801,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6740,7 +7813,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6753,7 +7826,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6765,7 +7838,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6778,7 +7851,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6792,7 +7865,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6805,7 +7878,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6819,7 +7892,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6830,7 +7903,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6842,7 +7915,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6855,7 +7928,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6868,7 +7941,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6882,7 +7955,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6895,7 +7968,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6909,7 +7982,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6924,7 +7997,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6938,7 +8011,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -6953,7 +8026,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -6961,7 +8034,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -6970,7 +8043,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100'
@@ -6980,7 +8053,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -6991,7 +8064,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7003,7 +8076,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7015,7 +8088,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7028,7 +8101,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7040,7 +8113,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7053,7 +8126,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7067,7 +8140,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7080,7 +8153,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7094,7 +8167,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7105,7 +8178,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7117,7 +8190,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7130,7 +8203,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7143,7 +8216,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7157,7 +8230,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7170,7 +8243,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7184,7 +8257,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7199,7 +8272,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7213,7 +8286,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -7228,7 +8301,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300'
@@ -7238,7 +8311,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7249,7 +8322,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7261,7 +8334,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7273,7 +8346,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7286,7 +8359,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7298,7 +8371,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7311,7 +8384,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7325,7 +8398,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7338,7 +8411,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7352,7 +8425,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7363,7 +8436,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7375,7 +8448,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7388,7 +8461,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7401,7 +8474,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7415,7 +8488,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7428,7 +8501,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7442,7 +8515,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7457,7 +8530,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7471,7 +8544,7 @@
   :responses:
   - past_payment
   - '2014-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -7482,50 +8555,26 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :past_payment_date?
-  :responses:
-  - past_payment
-  - '2013-10-01'
-  :next_node: :were_you_an_apprentice?
-  :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  :next_node: :how_old_were_you?
-  :outcome_node: false
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '15'
-  :next_node: :under_school_leaving_age_past
-  :outcome_node: true
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -7533,9 +8582,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100'
@@ -7544,9 +8592,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7556,22 +8603,20 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7582,9 +8627,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7596,9 +8640,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7609,9 +8652,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7623,9 +8665,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7633,14 +8674,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7652,9 +8692,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7662,14 +8701,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7679,9 +8717,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7692,23 +8729,21 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7720,9 +8755,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7735,9 +8769,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7749,9 +8782,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7764,9 +8796,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7775,14 +8806,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7795,9 +8825,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -7806,14 +8835,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300'
@@ -7822,9 +8850,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7834,9 +8861,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7847,9 +8873,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7860,9 +8885,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7874,9 +8898,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7887,9 +8910,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7901,9 +8923,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7916,9 +8937,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7930,9 +8950,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7945,9 +8964,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7957,9 +8975,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7970,9 +8987,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7984,9 +9000,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -7998,9 +9013,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -8013,9 +9027,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -8027,9 +9040,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -8042,9 +9054,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -8058,9 +9069,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -8073,9 +9083,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -8089,18 +9098,16 @@
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -8108,9 +9115,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100'
@@ -8119,9 +9125,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8131,22 +9136,20 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8157,9 +9160,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8171,9 +9173,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8184,9 +9185,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8198,9 +9198,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8208,14 +9207,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8227,9 +9225,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8242,9 +9239,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8254,9 +9250,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8267,23 +9262,21 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8295,9 +9288,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8310,9 +9302,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8324,9 +9315,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8339,9 +9329,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8350,14 +9339,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8370,9 +9358,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -8386,9 +9373,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300'
@@ -8397,9 +9383,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8409,9 +9394,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8422,9 +9406,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8435,9 +9418,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8449,9 +9431,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8462,9 +9443,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8476,9 +9456,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8491,9 +9470,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8505,9 +9483,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8520,9 +9497,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8532,9 +9508,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8545,9 +9520,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8559,9 +9533,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8573,9 +9546,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8588,9 +9560,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8602,9 +9573,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8617,9 +9587,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8633,9 +9602,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8648,9 +9616,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2013-10-01'
-  - 'no'
-  - '25'
+  - '2014-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -8661,18 +9628,41 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
+- :current_node: :past_payment_date?
+  :responses:
+  - past_payment
+  - '2013-10-01'
+  :next_node: :were_you_an_apprentice?
+  :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  :next_node: :how_old_were_you?
+  :outcome_node: false
+- :current_node: :how_old_were_you?
+  :responses:
+  - past_payment
+  - '2013-10-01'
+  - 'no'
+  - '15'
+  :next_node: :under_school_leaving_age_past
+  :outcome_node: true
+- :current_node: :how_old_were_you?
+  :responses:
+  - past_payment
+  - '2013-10-01'
+  - 'no'
+  - '25'
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -8680,7 +9670,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -8689,7 +9680,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100'
@@ -8699,7 +9691,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8710,19 +9703,21 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8734,20 +9729,22 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8759,7 +9756,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8772,7 +9770,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8780,13 +9779,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8799,7 +9799,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8807,13 +9808,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8824,7 +9826,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8836,20 +9839,22 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8862,7 +9867,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8870,13 +9876,14 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8889,7 +9896,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8903,7 +9911,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8912,13 +9921,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8932,7 +9942,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -8941,13 +9952,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300'
@@ -8957,7 +9969,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -8968,7 +9981,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -8980,7 +9994,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -8992,7 +10007,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9005,7 +10021,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9017,7 +10034,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9030,7 +10048,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9044,7 +10063,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9057,7 +10077,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9071,7 +10092,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9082,7 +10104,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9094,7 +10117,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9107,7 +10131,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9120,7 +10145,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9134,7 +10160,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9147,7 +10174,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9161,7 +10189,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9176,7 +10205,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9190,7 +10220,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -9205,7 +10236,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -9213,7 +10245,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -9222,7 +10255,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100'
@@ -9232,7 +10266,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9243,19 +10278,21 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9267,7 +10304,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9280,7 +10318,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9292,7 +10331,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9305,7 +10345,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9313,13 +10354,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9332,7 +10374,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9346,7 +10389,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9357,7 +10401,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9369,20 +10414,22 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9395,7 +10442,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9409,7 +10457,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9422,7 +10471,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9436,7 +10486,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9445,13 +10496,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9465,7 +10517,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -9480,7 +10533,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300'
@@ -9490,7 +10544,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9501,7 +10556,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9513,7 +10569,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9525,7 +10582,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9538,7 +10596,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9550,7 +10609,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9563,7 +10623,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9577,7 +10638,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9590,7 +10652,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9604,7 +10667,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9615,7 +10679,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9627,7 +10692,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9640,7 +10706,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9653,7 +10720,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9667,7 +10735,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9680,7 +10749,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9694,7 +10764,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9709,7 +10780,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9723,7 +10795,8 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -9738,14 +10811,14 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -9753,7 +10826,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -9762,7 +10835,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100'
@@ -9772,7 +10845,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9783,7 +10856,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9795,7 +10868,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9807,7 +10880,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9820,7 +10893,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9832,7 +10905,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9845,7 +10918,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9859,7 +10932,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9872,7 +10945,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9886,7 +10959,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9897,7 +10970,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9909,7 +10982,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9922,7 +10995,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9935,7 +11008,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9949,7 +11022,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9962,7 +11035,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9976,7 +11049,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -9991,7 +11064,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10005,7 +11078,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10020,7 +11093,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300'
@@ -10030,7 +11103,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10041,7 +11114,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10053,7 +11126,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10065,7 +11138,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10078,7 +11151,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10090,7 +11163,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10103,7 +11176,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10117,7 +11190,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10130,7 +11203,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10144,7 +11217,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10155,7 +11228,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10167,7 +11240,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10180,7 +11253,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10193,7 +11266,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10207,7 +11280,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10220,7 +11293,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10234,7 +11307,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10249,7 +11322,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10263,7 +11336,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -10278,7 +11351,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -10286,7 +11359,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -10295,7 +11368,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100'
@@ -10305,7 +11378,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10316,7 +11389,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10328,7 +11401,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10340,7 +11413,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10353,7 +11426,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10365,7 +11438,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10378,7 +11451,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10392,7 +11465,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10405,7 +11478,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10419,7 +11492,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10430,7 +11503,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10442,7 +11515,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10455,7 +11528,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10468,7 +11541,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10482,7 +11555,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10495,7 +11568,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10509,7 +11582,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10524,7 +11597,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10538,7 +11611,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -10553,7 +11626,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300'
@@ -10563,7 +11636,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10574,7 +11647,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10586,7 +11659,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10598,7 +11671,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10611,7 +11684,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10623,7 +11696,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10636,7 +11709,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10650,7 +11723,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10663,7 +11736,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10677,7 +11750,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10688,7 +11761,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10700,7 +11773,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10713,7 +11786,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10726,7 +11799,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10740,7 +11813,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10753,7 +11826,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10767,7 +11840,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10782,7 +11855,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10796,7 +11869,7 @@
   :responses:
   - past_payment
   - '2013-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -10807,50 +11880,26 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :past_payment_date?
-  :responses:
-  - past_payment
-  - '2012-10-01'
-  :next_node: :were_you_an_apprentice?
-  :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  :next_node: :how_old_were_you?
-  :outcome_node: false
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '15'
-  :next_node: :under_school_leaving_age_past
-  :outcome_node: true
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -10858,9 +11907,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100'
@@ -10869,9 +11917,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10881,9 +11928,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10894,9 +11940,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10907,9 +11952,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10921,9 +11965,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10934,9 +11977,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10948,9 +11990,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10963,9 +12004,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10977,9 +12017,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -10987,14 +12026,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11004,9 +12042,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11017,9 +12054,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11031,9 +12067,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11045,9 +12080,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11060,9 +12094,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11074,9 +12107,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11089,9 +12121,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11105,9 +12136,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11120,9 +12150,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -11131,14 +12160,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
-  - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - past_payment
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300'
@@ -11147,9 +12175,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11159,9 +12186,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11172,9 +12198,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11185,9 +12210,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11199,9 +12223,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11212,9 +12235,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11226,9 +12248,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11241,9 +12262,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11255,9 +12275,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11270,9 +12289,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11282,9 +12300,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11295,9 +12312,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11309,9 +12325,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11323,9 +12338,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11338,9 +12352,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11352,9 +12365,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11367,9 +12379,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11383,9 +12394,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11398,9 +12408,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -11414,18 +12423,16 @@
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -11433,9 +12440,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100'
@@ -11444,9 +12450,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11456,9 +12461,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11469,9 +12473,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11482,9 +12485,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11496,9 +12498,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11509,9 +12510,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11523,9 +12523,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11533,14 +12532,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11552,9 +12550,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11567,9 +12564,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11579,9 +12575,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11592,9 +12587,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11606,9 +12600,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11620,9 +12613,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11635,9 +12627,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11649,9 +12640,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11664,9 +12654,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11675,14 +12664,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11695,9 +12683,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -11711,9 +12698,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300'
@@ -11722,9 +12708,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11734,9 +12719,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11747,9 +12731,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11760,9 +12743,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11774,9 +12756,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11787,9 +12768,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11801,9 +12781,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11815,10 +12794,9 @@
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
-  - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - past_payment
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11830,9 +12808,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11845,9 +12822,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11857,9 +12833,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11870,9 +12845,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11884,9 +12858,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11898,9 +12871,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11913,9 +12885,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11927,9 +12898,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11942,9 +12912,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11958,9 +12927,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11973,9 +12941,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2012-10-01'
-  - 'no'
-  - '25'
+  - '2013-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -11986,18 +12953,41 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
+- :current_node: :past_payment_date?
+  :responses:
+  - past_payment
+  - '2012-10-01'
+  :next_node: :were_you_an_apprentice?
+  :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  :next_node: :how_old_were_you?
+  :outcome_node: false
+- :current_node: :how_old_were_you?
+  :responses:
+  - past_payment
+  - '2012-10-01'
+  - 'no'
+  - '15'
+  :next_node: :under_school_leaving_age_past
+  :outcome_node: true
+- :current_node: :how_old_were_you?
+  :responses:
+  - past_payment
+  - '2012-10-01'
+  - 'no'
+  - '25'
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -12005,7 +12995,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -12014,7 +13005,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100'
@@ -12024,7 +13016,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12035,19 +13028,21 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12059,20 +13054,22 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12084,7 +13081,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12097,7 +13095,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12105,13 +13104,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12124,7 +13124,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12132,13 +13133,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12149,7 +13151,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12161,20 +13164,22 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12187,7 +13192,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12195,13 +13201,14 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12214,7 +13221,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12228,7 +13236,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12237,13 +13246,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12257,7 +13267,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -12266,13 +13277,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300'
@@ -12282,7 +13294,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12293,7 +13306,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12305,7 +13319,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12317,7 +13332,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12330,7 +13346,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12342,7 +13359,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12355,7 +13373,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12369,7 +13388,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12382,7 +13402,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12396,7 +13417,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12407,7 +13429,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12419,7 +13442,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12432,7 +13456,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12445,7 +13470,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12459,7 +13485,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12472,7 +13499,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12486,7 +13514,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12501,7 +13530,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12515,7 +13545,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -12530,7 +13561,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -12538,7 +13570,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -12547,7 +13580,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100'
@@ -12557,7 +13591,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12568,19 +13603,21 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12592,7 +13629,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12605,7 +13643,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12617,7 +13656,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12630,7 +13670,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12638,13 +13679,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12657,7 +13699,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12671,7 +13714,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12682,7 +13726,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12694,20 +13739,22 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12720,7 +13767,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12734,7 +13782,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12747,7 +13796,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12761,7 +13811,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12770,13 +13821,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12790,7 +13842,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -12805,7 +13858,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300'
@@ -12815,7 +13869,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12826,7 +13881,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12838,7 +13894,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12850,7 +13907,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12863,7 +13921,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12875,7 +13934,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12888,7 +13948,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12902,7 +13963,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12915,7 +13977,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12929,7 +13992,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12940,7 +14004,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12952,7 +14017,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12965,7 +14031,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12978,7 +14045,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -12992,7 +14060,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -13005,7 +14074,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -13019,7 +14089,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -13034,7 +14105,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -13048,7 +14120,8 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -13063,14 +14136,14 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -13078,7 +14151,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -13087,7 +14160,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100'
@@ -13097,7 +14170,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13108,7 +14181,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13120,7 +14193,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13132,7 +14205,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13145,7 +14218,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13157,7 +14230,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13170,7 +14243,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13184,7 +14257,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13197,7 +14270,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13211,7 +14284,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13222,7 +14295,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13234,7 +14307,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13247,7 +14320,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13260,7 +14333,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13274,7 +14347,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13287,7 +14360,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13301,7 +14374,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13316,7 +14389,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13330,7 +14403,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -13345,7 +14418,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300'
@@ -13355,7 +14428,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13366,7 +14439,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13378,7 +14451,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13390,7 +14463,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13403,7 +14476,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13415,7 +14488,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13428,7 +14501,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13442,7 +14515,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13455,7 +14528,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13469,7 +14542,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13480,7 +14553,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13492,7 +14565,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13505,7 +14578,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13518,7 +14591,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13532,7 +14605,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13545,7 +14618,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13559,7 +14632,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13574,7 +14647,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13588,7 +14661,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -13603,7 +14676,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -13611,7 +14684,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -13620,7 +14693,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100'
@@ -13630,7 +14703,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13641,7 +14714,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13653,7 +14726,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13665,7 +14738,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13678,7 +14751,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13690,7 +14763,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13703,7 +14776,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13717,7 +14790,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13730,7 +14803,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13744,7 +14817,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13755,7 +14828,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13767,7 +14840,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13780,7 +14853,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13793,7 +14866,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13807,7 +14880,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13820,7 +14893,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13834,7 +14907,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13849,7 +14922,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13863,7 +14936,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -13878,7 +14951,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300'
@@ -13888,7 +14961,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -13899,7 +14972,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -13911,7 +14984,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -13923,7 +14996,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -13936,7 +15009,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -13948,7 +15021,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -13961,7 +15034,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -13975,7 +15048,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -13988,7 +15061,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14002,7 +15075,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14013,7 +15086,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14025,7 +15098,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14038,7 +15111,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14051,7 +15124,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14065,7 +15138,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14078,7 +15151,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14092,7 +15165,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14107,7 +15180,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14121,7 +15194,7 @@
   :responses:
   - past_payment
   - '2012-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -14132,50 +15205,26 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :past_payment_date?
-  :responses:
-  - past_payment
-  - '2011-10-01'
-  :next_node: :were_you_an_apprentice?
-  :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  :next_node: :how_old_were_you?
-  :outcome_node: false
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '15'
-  :next_node: :under_school_leaving_age_past
-  :outcome_node: true
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -14183,9 +15232,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100'
@@ -14194,9 +15242,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14206,9 +15253,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14219,9 +15265,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14232,9 +15277,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14246,9 +15290,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14259,9 +15302,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14273,9 +15315,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14288,9 +15329,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14302,9 +15342,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14312,14 +15351,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14329,9 +15367,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14342,9 +15379,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14356,9 +15392,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14370,9 +15405,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14385,9 +15419,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14399,9 +15432,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14414,9 +15446,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14430,9 +15461,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14445,9 +15475,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -14456,14 +15485,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300'
@@ -14472,9 +15500,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14484,9 +15511,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14497,9 +15523,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14510,9 +15535,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14524,9 +15548,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14537,9 +15560,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14551,9 +15573,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14566,9 +15587,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14580,9 +15600,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14595,9 +15614,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14607,9 +15625,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14620,9 +15637,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14634,9 +15650,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14648,9 +15663,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14663,9 +15677,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14677,9 +15690,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14692,9 +15704,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14708,9 +15719,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14723,9 +15733,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -14739,18 +15748,16 @@
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -14758,9 +15765,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100'
@@ -14769,9 +15775,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14781,9 +15786,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14794,9 +15798,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14807,9 +15810,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14821,9 +15823,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14834,9 +15835,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14848,9 +15848,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14858,14 +15857,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14877,9 +15875,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14892,9 +15889,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14904,9 +15900,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14917,9 +15912,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14931,9 +15925,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14945,9 +15938,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14960,9 +15952,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14974,9 +15965,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -14989,9 +15979,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -15000,14 +15989,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -15020,9 +16008,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -15036,9 +16023,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300'
@@ -15047,9 +16033,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15059,9 +16044,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15072,9 +16056,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15085,9 +16068,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15099,9 +16081,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15112,9 +16093,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15126,9 +16106,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15141,9 +16120,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15155,9 +16133,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15170,9 +16147,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15182,9 +16158,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15195,9 +16170,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15209,9 +16183,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15223,9 +16196,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15238,9 +16210,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15252,9 +16223,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15267,9 +16237,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15283,9 +16252,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15298,9 +16266,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2011-10-01'
-  - 'no'
-  - '25'
+  - '2012-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -15311,18 +16278,41 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
+- :current_node: :past_payment_date?
+  :responses:
+  - past_payment
+  - '2011-10-01'
+  :next_node: :were_you_an_apprentice?
+  :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  :next_node: :how_old_were_you?
+  :outcome_node: false
+- :current_node: :how_old_were_you?
+  :responses:
+  - past_payment
+  - '2011-10-01'
+  - 'no'
+  - '15'
+  :next_node: :under_school_leaving_age_past
+  :outcome_node: true
+- :current_node: :how_old_were_you?
+  :responses:
+  - past_payment
+  - '2011-10-01'
+  - 'no'
+  - '25'
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -15330,7 +16320,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -15339,7 +16330,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100'
@@ -15349,7 +16341,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15360,19 +16353,21 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15384,20 +16379,22 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15409,7 +16406,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15422,7 +16420,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15430,13 +16429,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15449,7 +16449,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15457,13 +16458,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15474,7 +16476,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15486,20 +16489,22 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15512,7 +16517,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15520,13 +16526,14 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15539,7 +16546,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15553,7 +16561,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15562,13 +16571,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15582,7 +16592,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -15591,13 +16602,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300'
@@ -15607,7 +16619,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15618,7 +16631,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15630,7 +16644,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15642,7 +16657,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15655,7 +16671,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15667,7 +16684,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15680,7 +16698,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15694,7 +16713,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15707,7 +16727,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15721,7 +16742,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15732,7 +16754,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15744,7 +16767,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15757,7 +16781,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15770,7 +16795,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15784,7 +16810,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15797,7 +16824,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15811,7 +16839,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15826,7 +16855,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15840,7 +16870,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -15855,7 +16886,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -15863,7 +16895,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -15872,7 +16905,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100'
@@ -15882,7 +16916,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -15893,19 +16928,21 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -15917,7 +16954,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -15930,7 +16968,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -15942,7 +16981,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -15955,7 +16995,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -15963,13 +17004,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -15982,7 +17024,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -15996,7 +17039,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -16007,7 +17051,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -16019,20 +17064,22 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -16045,7 +17092,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -16059,7 +17107,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -16072,7 +17121,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -16086,7 +17136,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -16095,13 +17146,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -16115,7 +17167,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -16130,7 +17183,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300'
@@ -16140,7 +17194,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16151,7 +17206,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16163,7 +17219,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16175,7 +17232,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16188,7 +17246,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16200,7 +17259,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16213,7 +17273,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16227,7 +17288,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16240,7 +17302,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16254,7 +17317,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16265,7 +17329,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16277,7 +17342,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16290,7 +17356,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16303,7 +17370,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16317,7 +17385,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16330,7 +17399,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16344,7 +17414,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16359,7 +17430,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16373,7 +17445,8 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -16388,14 +17461,14 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -16403,7 +17476,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -16412,7 +17485,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100'
@@ -16422,7 +17495,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16433,7 +17506,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16445,7 +17518,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16457,7 +17530,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16470,7 +17543,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16482,7 +17555,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16495,7 +17568,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16509,7 +17582,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16522,7 +17595,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16536,7 +17609,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16547,7 +17620,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16559,7 +17632,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16572,7 +17645,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16585,7 +17658,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16599,7 +17672,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16612,7 +17685,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16626,7 +17699,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16641,7 +17714,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16655,7 +17728,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -16670,7 +17743,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300'
@@ -16680,7 +17753,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16691,7 +17764,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16703,7 +17776,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16715,7 +17788,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16728,7 +17801,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16740,7 +17813,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16753,7 +17826,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16767,7 +17840,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16780,7 +17853,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16794,7 +17867,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16805,7 +17878,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16817,7 +17890,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16830,7 +17903,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16843,7 +17916,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16857,7 +17930,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16870,7 +17943,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16884,7 +17957,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16899,7 +17972,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16913,7 +17986,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -16928,7 +18001,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -16936,7 +18009,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -16945,7 +18018,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100'
@@ -16955,7 +18028,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -16966,7 +18039,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -16978,7 +18051,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -16990,7 +18063,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17003,7 +18076,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17015,7 +18088,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17028,7 +18101,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17042,7 +18115,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17055,7 +18128,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17069,7 +18142,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17080,7 +18153,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17092,7 +18165,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17105,7 +18178,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17118,7 +18191,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17132,7 +18205,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17145,7 +18218,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17159,7 +18232,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17174,7 +18247,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17188,7 +18261,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -17203,7 +18276,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300'
@@ -17213,7 +18286,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17224,7 +18297,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17236,7 +18309,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17248,7 +18321,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17261,7 +18334,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17273,7 +18346,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17286,7 +18359,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17300,7 +18373,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17313,7 +18386,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17327,7 +18400,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17338,7 +18411,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17350,7 +18423,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17363,7 +18436,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17376,7 +18449,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17390,7 +18463,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17403,7 +18476,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17417,7 +18490,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17432,7 +18505,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17446,7 +18519,7 @@
   :responses:
   - past_payment
   - '2011-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -17457,50 +18530,26 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :past_payment_date?
-  :responses:
-  - past_payment
-  - '2010-10-01'
-  :next_node: :were_you_an_apprentice?
-  :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  :next_node: :how_old_were_you?
-  :outcome_node: false
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '15'
-  :next_node: :under_school_leaving_age_past
-  :outcome_node: true
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -17508,9 +18557,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100'
@@ -17519,9 +18567,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17531,9 +18578,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17544,9 +18590,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17557,9 +18602,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17571,9 +18615,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17584,9 +18627,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17598,9 +18640,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17613,9 +18654,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17627,9 +18667,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17637,14 +18676,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17654,9 +18692,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17667,9 +18704,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17681,9 +18717,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17695,9 +18730,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17710,9 +18744,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17724,9 +18757,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17739,9 +18771,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17755,9 +18786,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17770,9 +18800,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -17781,14 +18810,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300'
@@ -17797,9 +18825,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17809,9 +18836,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17822,9 +18848,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17835,9 +18860,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17849,9 +18873,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17862,9 +18885,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17876,9 +18898,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17891,9 +18912,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17905,9 +18925,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17920,9 +18939,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17932,9 +18950,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17945,9 +18962,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17959,9 +18975,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17973,9 +18988,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -17988,9 +19002,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -18002,9 +19015,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -18017,9 +19029,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -18033,9 +19044,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -18048,9 +19058,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -18064,18 +19073,16 @@
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -18083,9 +19090,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100'
@@ -18094,9 +19100,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18106,9 +19111,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18119,9 +19123,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18132,9 +19135,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18146,9 +19148,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18159,9 +19160,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18173,9 +19173,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18183,14 +19182,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18202,9 +19200,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18217,9 +19214,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18229,9 +19225,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18242,9 +19237,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18256,9 +19250,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18270,9 +19263,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18285,9 +19277,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18299,9 +19290,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18314,9 +19304,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18325,14 +19314,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18345,9 +19333,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -18361,9 +19348,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300'
@@ -18372,9 +19358,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18384,9 +19369,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18397,9 +19381,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18410,9 +19393,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18424,9 +19406,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18437,9 +19418,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18451,9 +19431,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18466,9 +19445,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18480,9 +19458,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18495,9 +19472,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18507,9 +19483,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18520,9 +19495,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18534,9 +19508,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18548,9 +19521,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18563,9 +19535,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18577,9 +19548,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18592,9 +19562,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18608,9 +19577,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18623,9 +19591,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2010-10-01'
-  - 'no'
-  - '25'
+  - '2011-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -18636,18 +19603,41 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
+- :current_node: :past_payment_date?
+  :responses:
+  - past_payment
+  - '2010-10-01'
+  :next_node: :were_you_an_apprentice?
+  :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  :next_node: :how_old_were_you?
+  :outcome_node: false
+- :current_node: :how_old_were_you?
+  :responses:
+  - past_payment
+  - '2010-10-01'
+  - 'no'
+  - '15'
+  :next_node: :under_school_leaving_age_past
+  :outcome_node: true
+- :current_node: :how_old_were_you?
+  :responses:
+  - past_payment
+  - '2010-10-01'
+  - 'no'
+  - '25'
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -18655,7 +19645,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -18664,7 +19655,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100'
@@ -18674,7 +19666,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18685,19 +19678,21 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18709,20 +19704,22 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18734,7 +19731,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18747,7 +19745,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18755,13 +19754,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18774,7 +19774,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18782,13 +19783,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18799,7 +19801,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18811,20 +19814,22 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18837,7 +19842,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18845,13 +19851,14 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18864,7 +19871,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18878,7 +19886,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18887,13 +19896,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18907,7 +19917,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '100.0'
@@ -18916,13 +19927,14 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300'
@@ -18932,7 +19944,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -18943,7 +19956,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -18955,7 +19969,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -18967,7 +19982,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -18980,7 +19996,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -18992,7 +20009,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19005,7 +20023,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19019,7 +20038,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19032,7 +20052,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19046,7 +20067,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19057,7 +20079,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19069,7 +20092,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19082,7 +20106,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19095,7 +20120,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19109,7 +20135,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19122,7 +20149,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19136,7 +20164,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19151,7 +20180,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19165,7 +20195,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '1'
   - '16.0'
   - '300.0'
@@ -19180,7 +20211,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -19188,7 +20220,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -19197,7 +20230,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100'
@@ -19207,7 +20241,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19218,19 +20253,21 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19242,7 +20279,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19255,7 +20293,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19267,7 +20306,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19280,7 +20320,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19288,13 +20329,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19307,7 +20349,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19321,7 +20364,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19332,7 +20376,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19344,20 +20389,22 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19370,7 +20417,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19384,7 +20432,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19397,7 +20446,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19411,7 +20461,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19420,13 +20471,14 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19440,7 +20492,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '100.0'
@@ -19455,7 +20508,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300'
@@ -19465,7 +20519,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19476,7 +20531,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19488,7 +20544,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19500,7 +20557,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19513,7 +20571,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19525,7 +20584,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19538,7 +20598,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19552,7 +20613,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19565,7 +20627,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19579,7 +20642,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19590,7 +20654,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19602,7 +20667,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19615,7 +20681,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19628,7 +20695,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19642,7 +20710,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19655,7 +20724,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19669,7 +20739,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19684,7 +20755,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19698,7 +20770,8 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_under_19
+  - 'no'
+  - '25'
   - '31'
   - '16.0'
   - '300.0'
@@ -19713,14 +20786,14 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -19728,7 +20801,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -19737,7 +20810,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100'
@@ -19747,7 +20820,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19758,7 +20831,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19770,7 +20843,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19782,7 +20855,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19795,7 +20868,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19807,7 +20880,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19820,7 +20893,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19834,7 +20907,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19847,7 +20920,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19861,7 +20934,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19872,7 +20945,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19884,7 +20957,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19897,7 +20970,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19910,7 +20983,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19924,7 +20997,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19937,7 +21010,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19951,7 +21024,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19966,7 +21039,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19980,7 +21053,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '100.0'
@@ -19995,7 +21068,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300'
@@ -20005,7 +21078,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20016,7 +21089,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20028,7 +21101,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20040,7 +21113,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20053,7 +21126,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20065,7 +21138,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20078,7 +21151,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20092,7 +21165,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20105,7 +21178,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20119,7 +21192,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20130,7 +21203,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20142,7 +21215,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20155,7 +21228,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20168,7 +21241,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20182,7 +21255,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20195,7 +21268,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20209,7 +21282,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20224,7 +21297,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20238,7 +21311,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '1'
   - '16.0'
   - '300.0'
@@ -20253,7 +21326,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
@@ -20261,7 +21334,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -20270,7 +21343,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100'
@@ -20280,7 +21353,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20291,7 +21364,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20303,7 +21376,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20315,7 +21388,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20328,7 +21401,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20340,7 +21413,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20353,7 +21426,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20367,7 +21440,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20380,7 +21453,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20394,7 +21467,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20405,7 +21478,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20417,7 +21490,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20430,7 +21503,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20443,7 +21516,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20457,7 +21530,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20470,7 +21543,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20484,7 +21557,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20499,7 +21572,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20513,7 +21586,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '100.0'
@@ -20528,7 +21601,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300'
@@ -20538,7 +21611,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20549,7 +21622,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20561,7 +21634,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20573,7 +21646,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20586,7 +21659,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20598,7 +21671,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20611,7 +21684,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20625,7 +21698,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20638,7 +21711,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20652,7 +21725,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20663,7 +21736,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20675,7 +21748,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20688,7 +21761,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20701,7 +21774,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20715,7 +21788,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20728,7 +21801,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20742,7 +21815,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20757,7 +21830,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20771,7 +21844,7 @@
   :responses:
   - past_payment
   - '2010-10-01'
-  - apprentice_over_19
+  - apprentice_under_19
   - '31'
   - '16.0'
   - '300.0'
@@ -20782,50 +21855,26 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :past_payment_date?
-  :responses:
-  - past_payment
-  - '2009-10-01'
-  :next_node: :were_you_an_apprentice?
-  :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  :next_node: :how_old_were_you?
-  :outcome_node: false
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '15'
-  :next_node: :under_school_leaving_age_past
-  :outcome_node: true
-- :current_node: :how_old_were_you?
-  :responses:
-  - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -20833,9 +21882,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100'
@@ -20844,9 +21892,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20856,9 +21903,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20869,9 +21915,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20882,9 +21927,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20896,9 +21940,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20909,9 +21952,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20923,9 +21965,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20938,9 +21979,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20952,9 +21992,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20962,14 +22001,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20979,9 +22017,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -20992,9 +22029,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -21006,9 +22042,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -21020,9 +22055,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -21035,9 +22069,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -21049,9 +22082,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -21064,9 +22096,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -21080,9 +22111,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -21095,9 +22125,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '100.0'
@@ -21106,14 +22135,13 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300'
@@ -21122,9 +22150,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21134,9 +22161,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21147,9 +22173,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21160,9 +22185,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21174,9 +22198,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21187,9 +22210,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21201,9 +22223,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21215,10 +22236,9 @@
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
-  - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - past_payment
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21230,9 +22250,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21245,9 +22264,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21257,9 +22275,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21270,9 +22287,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21284,9 +22300,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21298,9 +22313,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21313,9 +22327,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21327,9 +22340,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21342,9 +22354,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21358,9 +22369,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21373,9 +22383,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '1'
   - '16.0'
   - '300.0'
@@ -21389,18 +22398,16 @@
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16'
   :next_node: :how_much_were_you_paid_during_pay_period?
@@ -21408,9 +22415,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100'
@@ -21419,9 +22425,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21431,9 +22436,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21444,9 +22448,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21457,9 +22460,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21471,9 +22473,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21484,9 +22485,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21498,9 +22498,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21508,14 +22507,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21527,9 +22525,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21542,9 +22539,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21554,9 +22550,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21567,9 +22562,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21581,9 +22575,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21595,9 +22588,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21610,9 +22602,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21624,9 +22615,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21639,9 +22629,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21650,14 +22639,13 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_below
+  :next_node: :past_payment_above
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21670,9 +22658,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '100.0'
@@ -21686,9 +22673,8 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300'
@@ -21697,9 +22683,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21709,9 +22694,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21722,9 +22706,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21735,9 +22718,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21749,9 +22731,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21762,9 +22743,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21776,9 +22756,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21791,9 +22770,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21805,9 +22783,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21820,9 +22797,8 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21832,9 +22808,8 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21845,9 +22820,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21859,9 +22833,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21873,9 +22846,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21888,9 +22860,8 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21902,9 +22873,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21917,9 +22887,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21933,9 +22902,8 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21948,9 +22916,8 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2009-10-01'
-  - 'no'
-  - '25'
+  - '2010-10-01'
+  - apprentice_over_19
   - '31'
   - '16.0'
   - '300.0'
@@ -21961,37 +22928,23 @@
   - '5'
   :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :were_you_an_apprentice?
-  :responses:
-  - past_payment
-  - '2009-10-01'
-  - apprentice_under_19
-  :next_node: :does_not_apply_to_historical_apprentices
-  :outcome_node: true
-- :current_node: :were_you_an_apprentice?
-  :responses:
-  - past_payment
-  - '2009-10-01'
-  - apprentice_over_19
-  :next_node: :does_not_apply_to_historical_apprentices
-  :outcome_node: true
 - :current_node: :past_payment_date?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   :next_node: :were_you_an_apprentice?
   :outcome_node: false
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   :next_node: :how_old_were_you?
   :outcome_node: false
 - :current_node: :how_old_were_you?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '15'
   :next_node: :under_school_leaving_age_past
@@ -21999,7 +22952,7 @@
 - :current_node: :how_old_were_you?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   :next_node: :how_often_did_you_get_paid?
@@ -22007,7 +22960,7 @@
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22016,7 +22969,7 @@
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22026,7 +22979,7 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22037,7 +22990,7 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22049,7 +23002,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22057,12 +23010,12 @@
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22075,7 +23028,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22084,12 +23037,12 @@
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22102,7 +23055,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22116,7 +23069,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22126,12 +23079,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22145,7 +23098,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22160,7 +23113,7 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22172,7 +23125,7 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22185,7 +23138,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22194,12 +23147,12 @@
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22213,7 +23166,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22223,12 +23176,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22242,7 +23195,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22257,7 +23210,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22268,12 +23221,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22288,7 +23241,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22304,7 +23257,7 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22315,7 +23268,7 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22327,7 +23280,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22340,7 +23293,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22353,7 +23306,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22367,7 +23320,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22380,7 +23333,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22394,7 +23347,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22409,7 +23362,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22423,7 +23376,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22438,7 +23391,7 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22450,7 +23403,7 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22463,7 +23416,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22477,7 +23430,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22491,7 +23444,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22506,7 +23459,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22520,7 +23473,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22535,7 +23488,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22551,7 +23504,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22566,7 +23519,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '1'
@@ -22582,7 +23535,7 @@
 - :current_node: :how_often_did_you_get_paid?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22591,7 +23544,7 @@
 - :current_node: :how_many_hours_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22601,7 +23554,7 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22612,7 +23565,7 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22624,7 +23577,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22632,12 +23585,12 @@
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22650,7 +23603,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22664,7 +23617,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22677,7 +23630,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22691,7 +23644,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22706,7 +23659,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22720,7 +23673,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22735,7 +23688,7 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22747,7 +23700,7 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22760,7 +23713,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22769,12 +23722,12 @@
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22788,7 +23741,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22803,7 +23756,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22817,7 +23770,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22832,7 +23785,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22843,12 +23796,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :past_payment_above
+  :next_node: :past_payment_below
   :outcome_node: true
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22863,7 +23816,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22879,7 +23832,7 @@
 - :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22890,7 +23843,7 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22902,7 +23855,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22915,7 +23868,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22928,7 +23881,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22942,7 +23895,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22955,7 +23908,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22969,7 +23922,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22984,7 +23937,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -22998,7 +23951,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23013,7 +23966,7 @@
 - :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23025,7 +23978,7 @@
 - :current_node: :what_was_overtime_pay_per_hour?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23038,7 +23991,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23052,7 +24005,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23066,7 +24019,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23081,7 +24034,7 @@
 - :current_node: :was_provided_with_accommodation?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23095,7 +24048,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23110,7 +24063,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23126,7 +24079,7 @@
 - :current_node: :past_accommodation_charge?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23141,7 +24094,7 @@
 - :current_node: :past_accommodation_usage?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23157,83 +24110,92 @@
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - apprentice_under_19
   :next_node: :does_not_apply_to_historical_apprentices
   :outcome_node: true
 - :current_node: :were_you_an_apprentice?
   :responses:
   - past_payment
-  - '2008-10-01'
+  - '2009-10-01'
   - apprentice_over_19
   :next_node: :does_not_apply_to_historical_apprentices
   :outcome_node: true
-- :current_node: :what_would_you_like_to_check?
+- :current_node: :past_payment_date?
   :responses:
-  - current_payment_april_2016
-  :next_node: :will_you_be_a_first_year_apprentice?
+  - past_payment
+  - '2008-10-01'
+  :next_node: :were_you_an_apprentice?
   :outcome_node: false
-- :current_node: :will_you_be_a_first_year_apprentice?
+- :current_node: :were_you_an_apprentice?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
-  :next_node: :how_old_are_you?
+  :next_node: :how_old_were_you?
   :outcome_node: false
-- :current_node: :how_old_are_you?
+- :current_node: :how_old_were_you?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '15'
-  :next_node: :how_old_are_you?
-  :outcome_node: false
-- :current_node: :how_old_are_you?
+  :next_node: :under_school_leaving_age_past
+  :outcome_node: true
+- :current_node: :how_old_were_you?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
-  :next_node: :how_often_do_you_get_paid?
+  :next_node: :how_often_did_you_get_paid?
   :outcome_node: false
-- :current_node: :how_often_do_you_get_paid?
+- :current_node: :how_often_did_you_get_paid?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
-  :next_node: :how_many_hours_do_you_work?
+  :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_do_you_work?
+- :current_node: :how_many_hours_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
   - '16'
-  :next_node: :how_much_are_you_paid_during_pay_period?
+  :next_node: :how_much_were_you_paid_during_pay_period?
   :outcome_node: false
-- :current_node: :how_much_are_you_paid_during_pay_period?
+- :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
   - '16.0'
   - '100'
-  :next_node: :how_many_hours_overtime_do_you_work?
+  :next_node: :how_many_hours_overtime_did_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_overtime_do_you_work?
+- :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '0'
-  :next_node: :is_provided_with_accommodation?
+  :next_node: :was_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23241,11 +24203,12 @@
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23253,11 +24216,12 @@
   - '100.0'
   - '0.0'
   - yes_free
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23266,11 +24230,12 @@
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23278,11 +24243,12 @@
   - '100.0'
   - '0.0'
   - yes_charged
-  :next_node: :current_accommodation_charge?
+  :next_node: :past_accommodation_charge?
   :outcome_node: false
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23291,11 +24257,12 @@
   - '0.0'
   - yes_charged
   - '5'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23305,11 +24272,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23318,11 +24286,12 @@
   - '0.0'
   - yes_charged
   - '50'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23332,22 +24301,24 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :how_many_hours_overtime_do_you_work?
+- :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
   - '16.0'
   - '100.0'
   - '8'
-  :next_node: :what_is_overtime_pay_per_hour?
+  :next_node: :what_was_overtime_pay_per_hour?
   :outcome_node: false
-- :current_node: :what_is_overtime_pay_per_hour?
+- :current_node: :what_was_overtime_pay_per_hour?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23355,11 +24326,12 @@
   - '100.0'
   - '8.0'
   - '10'
-  :next_node: :is_provided_with_accommodation?
+  :next_node: :was_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23368,11 +24340,12 @@
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23381,11 +24354,12 @@
   - '8.0'
   - '10.0'
   - yes_free
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23395,11 +24369,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23408,11 +24383,12 @@
   - '8.0'
   - '10.0'
   - yes_charged
-  :next_node: :current_accommodation_charge?
+  :next_node: :past_accommodation_charge?
   :outcome_node: false
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23422,11 +24398,12 @@
   - '10.0'
   - yes_charged
   - '5'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23437,11 +24414,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23451,11 +24429,12 @@
   - '10.0'
   - yes_charged
   - '50'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23466,32 +24445,35 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :how_much_are_you_paid_during_pay_period?
+- :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
   - '16.0'
   - '300'
-  :next_node: :how_many_hours_overtime_do_you_work?
+  :next_node: :how_many_hours_overtime_did_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_overtime_do_you_work?
+- :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
   - '16.0'
   - '300.0'
   - '0'
-  :next_node: :is_provided_with_accommodation?
+  :next_node: :was_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23499,11 +24481,12 @@
   - '300.0'
   - '0.0'
   - 'no'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23511,11 +24494,12 @@
   - '300.0'
   - '0.0'
   - yes_free
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23524,11 +24508,12 @@
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23536,11 +24521,12 @@
   - '300.0'
   - '0.0'
   - yes_charged
-  :next_node: :current_accommodation_charge?
+  :next_node: :past_accommodation_charge?
   :outcome_node: false
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23549,11 +24535,12 @@
   - '0.0'
   - yes_charged
   - '5'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23563,11 +24550,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23576,11 +24564,12 @@
   - '0.0'
   - yes_charged
   - '50'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23590,22 +24579,24 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :how_many_hours_overtime_do_you_work?
+- :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
   - '16.0'
   - '300.0'
   - '8'
-  :next_node: :what_is_overtime_pay_per_hour?
+  :next_node: :what_was_overtime_pay_per_hour?
   :outcome_node: false
-- :current_node: :what_is_overtime_pay_per_hour?
+- :current_node: :what_was_overtime_pay_per_hour?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23613,11 +24604,12 @@
   - '300.0'
   - '8.0'
   - '10'
-  :next_node: :is_provided_with_accommodation?
+  :next_node: :was_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23626,11 +24618,12 @@
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23639,11 +24632,12 @@
   - '8.0'
   - '10.0'
   - yes_free
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23653,11 +24647,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23666,11 +24661,12 @@
   - '8.0'
   - '10.0'
   - yes_charged
-  :next_node: :current_accommodation_charge?
+  :next_node: :past_accommodation_charge?
   :outcome_node: false
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23680,11 +24676,12 @@
   - '10.0'
   - yes_charged
   - '5'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23695,11 +24692,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23709,11 +24707,12 @@
   - '10.0'
   - yes_charged
   - '50'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '1'
@@ -23724,49 +24723,54 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :how_often_do_you_get_paid?
+- :current_node: :how_often_did_you_get_paid?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
-  :next_node: :how_many_hours_do_you_work?
+  :next_node: :how_many_hours_did_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_do_you_work?
+- :current_node: :how_many_hours_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
   - '16'
-  :next_node: :how_much_are_you_paid_during_pay_period?
+  :next_node: :how_much_were_you_paid_during_pay_period?
   :outcome_node: false
-- :current_node: :how_much_are_you_paid_during_pay_period?
+- :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
   - '16.0'
   - '100'
-  :next_node: :how_many_hours_overtime_do_you_work?
+  :next_node: :how_many_hours_overtime_did_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_overtime_do_you_work?
+- :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '0'
-  :next_node: :is_provided_with_accommodation?
+  :next_node: :was_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23774,11 +24778,12 @@
   - '100.0'
   - '0.0'
   - 'no'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23786,11 +24791,12 @@
   - '100.0'
   - '0.0'
   - yes_free
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23799,11 +24805,12 @@
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23811,11 +24818,12 @@
   - '100.0'
   - '0.0'
   - yes_charged
-  :next_node: :current_accommodation_charge?
+  :next_node: :past_accommodation_charge?
   :outcome_node: false
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23824,11 +24832,12 @@
   - '0.0'
   - yes_charged
   - '5'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23838,11 +24847,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23851,11 +24861,12 @@
   - '0.0'
   - yes_charged
   - '50'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23865,22 +24876,24 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :how_many_hours_overtime_do_you_work?
+- :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
   - '16.0'
   - '100.0'
   - '8'
-  :next_node: :what_is_overtime_pay_per_hour?
+  :next_node: :what_was_overtime_pay_per_hour?
   :outcome_node: false
-- :current_node: :what_is_overtime_pay_per_hour?
+- :current_node: :what_was_overtime_pay_per_hour?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23888,11 +24901,12 @@
   - '100.0'
   - '8.0'
   - '10'
-  :next_node: :is_provided_with_accommodation?
+  :next_node: :was_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23901,11 +24915,12 @@
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23914,11 +24929,12 @@
   - '8.0'
   - '10.0'
   - yes_free
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23928,11 +24944,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23941,11 +24958,12 @@
   - '8.0'
   - '10.0'
   - yes_charged
-  :next_node: :current_accommodation_charge?
+  :next_node: :past_accommodation_charge?
   :outcome_node: false
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23955,11 +24973,12 @@
   - '10.0'
   - yes_charged
   - '5'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23970,11 +24989,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23984,11 +25004,12 @@
   - '10.0'
   - yes_charged
   - '50'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -23999,32 +25020,35 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :how_much_are_you_paid_during_pay_period?
+- :current_node: :how_much_were_you_paid_during_pay_period?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
   - '16.0'
   - '300'
-  :next_node: :how_many_hours_overtime_do_you_work?
+  :next_node: :how_many_hours_overtime_did_you_work?
   :outcome_node: false
-- :current_node: :how_many_hours_overtime_do_you_work?
+- :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
   - '16.0'
   - '300.0'
   - '0'
-  :next_node: :is_provided_with_accommodation?
+  :next_node: :was_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24032,11 +25056,12 @@
   - '300.0'
   - '0.0'
   - 'no'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24044,11 +25069,12 @@
   - '300.0'
   - '0.0'
   - yes_free
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24057,11 +25083,12 @@
   - '0.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24069,11 +25096,12 @@
   - '300.0'
   - '0.0'
   - yes_charged
-  :next_node: :current_accommodation_charge?
+  :next_node: :past_accommodation_charge?
   :outcome_node: false
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24082,11 +25110,12 @@
   - '0.0'
   - yes_charged
   - '5'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24096,11 +25125,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24109,11 +25139,12 @@
   - '0.0'
   - yes_charged
   - '50'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24123,22 +25154,24 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
   :outcome_node: true
-- :current_node: :how_many_hours_overtime_do_you_work?
+- :current_node: :how_many_hours_overtime_did_you_work?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
   - '16.0'
   - '300.0'
   - '8'
-  :next_node: :what_is_overtime_pay_per_hour?
+  :next_node: :what_was_overtime_pay_per_hour?
   :outcome_node: false
-- :current_node: :what_is_overtime_pay_per_hour?
+- :current_node: :what_was_overtime_pay_per_hour?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24146,11 +25179,12 @@
   - '300.0'
   - '8.0'
   - '10'
-  :next_node: :is_provided_with_accommodation?
+  :next_node: :was_provided_with_accommodation?
   :outcome_node: false
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24159,11 +25193,12 @@
   - '8.0'
   - '10.0'
   - 'no'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24172,11 +25207,12 @@
   - '8.0'
   - '10.0'
   - yes_free
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24186,11 +25222,12 @@
   - '10.0'
   - yes_free
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :is_provided_with_accommodation?
+- :current_node: :was_provided_with_accommodation?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24199,11 +25236,12 @@
   - '8.0'
   - '10.0'
   - yes_charged
-  :next_node: :current_accommodation_charge?
+  :next_node: :past_accommodation_charge?
   :outcome_node: false
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24213,11 +25251,12 @@
   - '10.0'
   - yes_charged
   - '5'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24228,11 +25267,12 @@
   - yes_charged
   - '5.0'
   - '5'
-  :next_node: :current_payment_above
+  :next_node: :past_payment_above
   :outcome_node: true
-- :current_node: :current_accommodation_charge?
+- :current_node: :past_accommodation_charge?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24242,11 +25282,12 @@
   - '10.0'
   - yes_charged
   - '50'
-  :next_node: :current_accommodation_usage?
+  :next_node: :past_accommodation_usage?
   :outcome_node: false
-- :current_node: :current_accommodation_usage?
+- :current_node: :past_accommodation_usage?
   :responses:
-  - current_payment_april_2016
+  - past_payment
+  - '2008-10-01'
   - 'no'
   - '25'
   - '31'
@@ -24257,11 +25298,19 @@
   - yes_charged
   - '50.0'
   - '5'
-  :next_node: :current_payment_below
+  :next_node: :past_payment_below
+  :outcome_node: true
+- :current_node: :were_you_an_apprentice?
+  :responses:
+  - past_payment
+  - '2008-10-01'
+  - apprentice_under_19
+  :next_node: :does_not_apply_to_historical_apprentices
   :outcome_node: true
-- :current_node: :will_you_be_a_first_year_apprentice?
+- :current_node: :were_you_an_apprentice?
   :responses:
-  - current_payment_april_2016
-  - 'yes'
-  :next_node: :does_not_apply_to_first_year_apprentices
+  - past_payment
+  - '2008-10-01'
+  - apprentice_over_19
+  :next_node: :does_not_apply_to_historical_apprentices
   :outcome_node: true
diff --git a/test/data/minimum-wage-calculator-employers-files.yml b/test/data/minimum-wage-calculator-employers-files.yml
index 7cc0f1c4f50..f86e257be66 100644
--- a/test/data/minimum-wage-calculator-employers-files.yml
+++ b/test/data/minimum-wage-calculator-employers-files.yml
@@ -1,10 +1,10 @@
 ---
-lib/smart_answer_flows/minimum-wage-calculator-employers.rb: 3a31340bcfd4d5af920bf68bd60ebfbd
+lib/smart_answer_flows/minimum-wage-calculator-employers.rb: 49ffb426915e1775168e0b932f91165e
 test/data/minimum-wage-calculator-employers-questions-and-responses.yml: ddadb3fc5fc1d82d77f53fbc90752d89
 test/data/minimum-wage-calculator-employers-responses-and-expected-results.yml: 3f047b0007e3432a77ea4e896ea763ea
-lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.govspeak.erb: 925ea68bf1c68cb973393159b8ea01b7
-lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.govspeak.erb: 0edb4839bb3026f13395be0ac3fca8e4
-lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.govspeak.erb: c16d2ff73793f4b2058261b3e99d6a13
+lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.govspeak.erb: 4785f414ecc1fbab2a234582e4a12eed
+lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_above.govspeak.erb: 213bc34a9df44bccd60642655f165eed
+lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/current_payment_below.govspeak.erb: 19282268790be35937da775f3abcc507
 lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/does_not_apply_to_historical_apprentices.govspeak.erb: b7db231cc648b8b6abc846efd5a840ff
 lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_above.govspeak.erb: 7d7d67dc3b83ec3db36c165507df9afa
 lib/smart_answer_flows/minimum-wage-calculator-employers/outcomes/past_payment_below.govspeak.erb: 01e495068f33691669433bb9402a0aef
@@ -31,8 +31,8 @@ lib/smart_answer_flows/minimum-wage-calculator-employers/questions/was_provided_
 lib/smart_answer_flows/minimum-wage-calculator-employers/questions/were_you_an_apprentice.govspeak.erb: 5934af86789f2ebe158bc1239636c050
 lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_is_overtime_pay_per_hour.govspeak.erb: 72883e35065286ae84b9bb7035b2f081
 lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_was_overtime_pay_per_hour.govspeak.erb: 82a7b7b692aac807fdd73c4f5b6aea22
-lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.govspeak.erb: a9fce44b7f15b6f72eee6df0464f7bbf
+lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.govspeak.erb: 2e13e0db5fc85cfee598e5ebe2cc8499
 lib/smart_answer_flows/shared/minimum_wage/_acas_information.govspeak.erb: 582cdf982fa5619072ddd883bf4c1555
 lib/smart_answer_flows/shared_logic/minimum_wage.rb: d27e8aa03ebf55901c24d39118ebef62
-lib/smart_answer/calculators/minimum_wage_calculator.rb: f12e8aa4630065b6bdc65a5ae4564f8e
+lib/smart_answer/calculators/minimum_wage_calculator.rb: a738d3f7bd5263b1e3e138711ead919c
 lib/data/minimum_wage_data.yml: ff0204584fe4e0672370fda487121915
diff --git a/test/integration/smart_answer_flows/am_i_getting_minimum_wage_test.rb b/test/integration/smart_answer_flows/am_i_getting_minimum_wage_test.rb
index e4e4d685be7..0dcc3d7ed02 100644
--- a/test/integration/smart_answer_flows/am_i_getting_minimum_wage_test.rb
+++ b/test/integration/smart_answer_flows/am_i_getting_minimum_wage_test.rb
@@ -254,6 +254,30 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
       end # Age
 
       # Scenario 8
+      context "24 year old" do
+        setup do
+          add_response 24
+          add_response 7
+          add_response 35
+          add_response 350
+          add_response 10
+          add_response 12
+          add_response :yes_charged
+          add_response 30
+          add_response 7
+        end
+        should "be below the minimum wage" do
+          assert_current_node :current_payment_below
+        end
+        should "make outcome calculations" do
+          assert_equal 45, current_state.calculator.total_hours
+          assert_equal 6.50, current_state.calculator.minimum_hourly_rate
+          assert_equal 6.12, current_state.calculator.total_hourly_rate
+          assert_equal false, current_state.calculator.minimum_wage_or_above?
+        end
+      end
+
+      # Scenario 9
       context "25 year old" do
         setup do
           add_response 25
@@ -271,7 +295,7 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
         end
         should "make outcome calculations" do
           assert_equal 45, current_state.calculator.total_hours
-          assert_equal 6.50, current_state.calculator.minimum_hourly_rate
+          assert_equal 7.20, current_state.calculator.minimum_hourly_rate
           assert_equal 6.12, current_state.calculator.total_hourly_rate
           assert_equal false, current_state.calculator.minimum_wage_or_above?
         end
@@ -622,7 +646,7 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
       add_response 'no'
 
       assert_current_node :how_old_were_you?
-      add_response '25'
+      add_response '24'
 
       assert_current_node :how_often_did_you_get_paid?
       add_response '7'
diff --git a/test/unit/calculators/minimum_wage_calculator_test.rb b/test/unit/calculators/minimum_wage_calculator_test.rb
index 0d489b45ceb..da44aec9cd1 100644
--- a/test/unit/calculators/minimum_wage_calculator_test.rb
+++ b/test/unit/calculators/minimum_wage_calculator_test.rb
@@ -241,6 +241,12 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
         should "be the minimum wage per hour for the age and year" do
           assert_equal 4.92, @calculator.minimum_hourly_rate
         end
+        context "when eligible for living wage?" do
+          should "return the national living wage rate" do
+            @calculator = MinimumWageCalculator.new(age: 25)
+            assert_equal 7.2, @calculator.minimum_hourly_rate
+          end
+        end
       end
 
       context "total hours" do
@@ -342,12 +348,12 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       # for various scenarios.
       #
       # Scenario 1
-      context "minimum wage calculator for a 25 yr old low hourly rate" do
+      context "minimum wage calculator for a 24 yr old low hourly rate" do
         setup do
           # NOTE: test_date included as all minimum wage calculations are date sensitive
           test_date = Date.parse("2012-08-01")
           @calculator = MinimumWageCalculator.new(
-            age: 25, pay_frequency: 7, basic_pay: 168, basic_hours: 40, date: test_date)
+            age: 24, pay_frequency: 7, basic_pay: 168, basic_hours: 40, date: test_date)
         end
 
         should "have a total hourly rate of 4.20" do
@@ -439,10 +445,10 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       end
 
       # Scenario 3
-      context "25 y/o with a low hourly rate" do
+      context "24 y/o with a low hourly rate" do
         setup do
           @calculator = MinimumWageCalculator.new(
-            age: 25, date: Date.parse('2011-10-01'), pay_frequency: 7, basic_pay: 100, basic_hours: 40)
+            age: 24, date: Date.parse('2011-10-01'), pay_frequency: 7, basic_pay: 100, basic_hours: 40)
         end
 
         should "calculate total hourly rate" do
@@ -476,10 +482,10 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       end
 
       # Scenario 4
-      context "25 y/o in 2011, no accommodation, varying overtime" do
+      context "24 y/o in 2011, no accommodation, varying overtime" do
         setup do
           @calculator = MinimumWageCalculator.new(
-            age: 25, date: Date.parse('2011-10-01'), pay_frequency: 7, basic_pay: 100, basic_hours: 40)
+            age: 24, date: Date.parse('2011-10-01'), pay_frequency: 7, basic_pay: 100, basic_hours: 40)
           @calculator.overtime_hours = 10
         end
 
@@ -574,10 +580,10 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       end
 
       # Scenario 6
-      context "25 y/o 2008-2009 with accommodation and overtime variations." do
+      context "24 y/o 2008-2009 with accommodation and overtime variations." do
         setup do
           @calculator = MinimumWageCalculator.new(
-            age: 25, date: Date.parse('2008-10-01'), pay_frequency: 7, basic_pay: 168, basic_hours: 40)
+            age: 24, date: Date.parse('2008-10-01'), pay_frequency: 7, basic_pay: 168, basic_hours: 40)
           @calculator.overtime_hours = 7
           @calculator.overtime_hourly_rate = 5.7
         end
@@ -639,10 +645,10 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       end
 
       # Scenario 8
-      context "25 y/o 2011-12 with high accommodation charge variations." do
+      context "24 y/o 2011-12 with high accommodation charge variations." do
         setup do
           @calculator = MinimumWageCalculator.new(
-            age: 25, date: Date.parse('2012-08-21'), pay_frequency: 7, basic_pay: 350, basic_hours: 35)
+            age: 24, date: Date.parse('2012-08-21'), pay_frequency: 7, basic_pay: 350, basic_hours: 35)
           @calculator.overtime_hours = 10
           @calculator.overtime_hourly_rate = 12
         end
@@ -855,7 +861,7 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
     context "non-historical minimum wage" do
       should "return today's minimum wage rate for 25 year old" do
         @calculator = MinimumWageCalculator.new(
-          age: 25, pay_frequency: 7, basic_pay: 312, basic_hours: 39, date: Date.parse("5 Aug 2012"))
+          age: 24, pay_frequency: 7, basic_pay: 312, basic_hours: 39, date: Date.parse("5 Aug 2012"))
         assert_equal 6.08, @calculator.minimum_hourly_rate
       end
       should "return today's minimum wage rate for 19 year old" do
@@ -873,7 +879,7 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
     context "non-historical total entitlement and underpayment test" do
       setup do
         @calculator = MinimumWageCalculator.new(
-          age: 25, pay_frequency: 7, basic_pay: 100, basic_hours: 39, date: Date.parse("5 Aug 2012")
+          age: 24, pay_frequency: 7, basic_pay: 100, basic_hours: 39, date: Date.parse("5 Aug 2012")
           )
       end
       should "return total_entitlement" do
@@ -919,7 +925,7 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       end
       should "below minimum_wage_or_above (200)" do
         @calculator = MinimumWageCalculator.new(
-          age: 25,
+          age: 24,
           pay_frequency: 7,
           basic_pay: 200,
           basic_hours: 40,
@@ -936,7 +942,7 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       # Test URL: /am-i-getting-minimum-wage/y/past_payment/2007-10-01/no/25/7/40/100.0/0/no
       should "historical_adjustment test: hours: 40; pay: 100; date: 5 Aug 2008" do
         @calculator = MinimumWageCalculator.new(
-          age: 25,
+          age: 24,
           pay_frequency: 7,
           basic_pay: 100,
           basic_hours: 40,
@@ -950,7 +956,7 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       # Test URL: /am-i-getting-minimum-wage/y/past_payment/2008-10-01/no/25/7/40/100.0/0/no
       should "historical_adjustment test: hours: 40; pay: 100; date: 5 Aug 2009" do
         @calculator = MinimumWageCalculator.new(
-          age: 25,
+          age: 24,
           pay_frequency: 7,
           basic_pay: 100,
           basic_hours: 40,
@@ -964,7 +970,7 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       # Test URL: /am-i-getting-minimum-wage/y/past_payment/2008-10-01/no/25/7/40/40.0/0/no
       should "historical_adjustment test: hours: 40; pay: 40" do
         @calculator = MinimumWageCalculator.new(
-          age: 25,
+          age: 24,
           pay_frequency: 7,
           basic_pay: 40,
           basic_hours: 40,
@@ -978,7 +984,7 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       # Test URL: /am-i-getting-minimum-wage/y/past_payment/2007-10-01/no/25/28/147/741.0/0/no
       should "historical_adjustment test: hours: 147; pay: 741" do
         @calculator = MinimumWageCalculator.new(
-          age: 25,
+          age: 24,
           pay_frequency: 28,
           basic_pay: 741,
           basic_hours: 147,
@@ -992,7 +998,7 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       # Test URL: /am-i-getting-minimum-wage/y/past_payment/2007-10-01/no/25/28/147/696.0/0/no
       should "historical_adjustment test: hours: 147; pay: 696" do
         @calculator = MinimumWageCalculator.new(
-          age: 25,
+          age: 24,
           pay_frequency: 28,
           basic_pay: 696,
           basic_hours: 147,
@@ -1006,7 +1012,7 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       # Test URL: /am-i-getting-minimum-wage/y/past_payment/2007-10-01/no/25/28/147/661.0/0/no
       should "historical_adjustment test: hours: 147; pay: 661" do
         @calculator = MinimumWageCalculator.new(
-          age: 25,
+          age: 24,
           pay_frequency: 28,
           basic_pay: 661,
           basic_hours: 147,
diff --git a/test/unit/smart_answer_flows/am_i_getting_minimum_wage_flow_test.rb b/test/unit/smart_answer_flows/am_i_getting_minimum_wage_flow_test.rb
index 912fd1e6352..1df10215232 100644
--- a/test/unit/smart_answer_flows/am_i_getting_minimum_wage_flow_test.rb
+++ b/test/unit/smart_answer_flows/am_i_getting_minimum_wage_flow_test.rb
@@ -19,8 +19,7 @@ class AmIGettingMinimumWageFlowTest < ActiveSupport::TestCase
             @state = SmartAnswer::State.new(@question)
             @calculator = stub('calculator',
               :age= => nil,
-              :under_school_leaving_age? => nil,
-              :what_to_check => nil
+              :under_school_leaving_age? => nil
             )
             @state.calculator = @calculator
           end