diff --git a/lib/smart_answer/calculators/minimum_wage_calculator.rb b/lib/smart_answer/calculators/minimum_wage_calculator.rb
index 8cfa683b4f7..cab8298caaa 100644
--- a/lib/smart_answer/calculators/minimum_wage_calculator.rb
+++ b/lib/smart_answer/calculators/minimum_wage_calculator.rb
@@ -3,6 +3,13 @@ class MinimumWageCalculator
 
     attr_accessor :overtime_hours, :overtime_hourly_rate, :accommodation_cost
 
+    attr_accessor :age, :date, :pay_frequency, :basic_hours, :basic_pay, :is_apprentice
+
+    def date=(date)
+      @date = date
+      @minimum_wage_data = minimum_wage_data_for_date(@date)
+    end
+
     def initialize(params = {})
       @age = params[:age]
       @date = (params[:date].nil? ? Date.today : params[:date])
@@ -16,6 +23,30 @@ def initialize(params = {})
       @minimum_wage_data = minimum_wage_data_for_date(@date)
     end
 
+    def valid_age?(age)
+      age > 0 && age <= 200
+    end
+
+    def valid_pay_frequency?(pay_frequency)
+      pay_frequency >= 1 && pay_frequency <= 31
+    end
+
+    def valid_hours_worked?(hours_worked)
+      hours_worked > 0 && hours_worked <= (@pay_frequency * 16)
+    end
+
+    def valid_overtime_hours_worked?(overtime_hours_worked)
+      overtime_hours_worked >= 0
+    end
+
+    def valid_accommodation_charge?(accommodation_charge)
+      accommodation_charge > 0
+    end
+
+    def valid_accommodation_usage?(accommodation_usage)
+      accommodation_usage >= 0 && accommodation_usage <= 7
+    end
+
     def basic_rate
       rate = @basic_pay / @basic_hours
       if overtime_hours > 0 and overtime_hourly_rate > 0 and rate > overtime_hourly_rate
@@ -50,10 +81,6 @@ def total_overtime_pay
       (@overtime_hours * overtime_hourly_rate).round(2)
     end
 
-    def total_working_pay
-      (basic_total + total_overtime_pay).round(2)
-    end
-
     def total_pay
       (basic_total + total_overtime_pay + @accommodation_cost).round(2)
     end
@@ -125,15 +152,26 @@ def minimum_wage_data_for_date(date = Date.today)
       end
     end
 
-    def format_money(value)
-      # regex strips zeros
-      str = sprintf("%.#{2}f", value).to_s.sub(/\.0+$/, '')
-    end
-
     def free_accommodation_rate
       @minimum_wage_data[:accommodation_rate]
     end
 
+    def apprentice_eligible_for_minimum_wage?
+      date >= Date.parse('2010-10-01')
+    end
+
+    def under_school_leaving_age?
+      age < 16
+    end
+
+    def historically_receiving_minimum_wage?
+      historical_adjustment <= 0
+    end
+
+    def any_overtime_hours_worked?
+      overtime_hours > 0
+    end
+
     protected
 
     def weekly_multiplier
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_above.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_above.govspeak.erb
index a4f8af9261f..e13a0400dfa 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_above.govspeak.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_above.govspeak.erb
@@ -5,7 +5,7 @@
 
   The National Minimum Wage per hour for your age | Your actual pay
   - | -
-  £<%= minimum_hourly_rate %> | £<%= total_hourly_rate %>
+  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
 
   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/lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_below.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_below.govspeak.erb
index 668e2e012de..ebccc57e69a 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_below.govspeak.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_below.govspeak.erb
@@ -5,7 +5,7 @@
 
   The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
   - | - | -
-  £<%= minimum_hourly_rate %> | £<%= total_hourly_rate %> * | £<%= total_underpayment %>
+  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.total_underpayment) %>
 
   \* This figure has been rounded to the nearest penny.
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_above.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_above.govspeak.erb
index 3bda0de0b3b..71365aaa61a 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_above.govspeak.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_above.govspeak.erb
@@ -7,7 +7,7 @@
 
   The National Minimum Wage per hour at the time | Your actual pay
   - | -
-  £<%= minimum_hourly_rate %> | £<%= total_hourly_rate %>
+  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
 
   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/lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_below.govspeak.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_below.govspeak.erb
index 2d9e8067055..170b168972d 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_below.govspeak.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_below.govspeak.erb
@@ -6,7 +6,7 @@
 
   The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
   - | -
-  £<%= minimum_hourly_rate %> | £<%= total_hourly_rate %> * | £<%= total_underpayment %>
+  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.historical_adjustment) %>
 
   \* This figure has been rounded to the nearest penny.
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_above.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_above.govspeak.erb
index 4c004c168e9..9a849a5e07d 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_above.govspeak.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_above.govspeak.erb
@@ -5,7 +5,7 @@
 
   The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
   - | -
-  £<%= minimum_hourly_rate %> | £<%= total_hourly_rate %>
+  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
 
   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/current_payment_below.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_below.govspeak.erb
index dbe974c0363..8a7106e48b3 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_below.govspeak.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_below.govspeak.erb
@@ -5,7 +5,7 @@
 
   The National Minimum Wage per hour for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
   - | - | -
-  £<%= minimum_hourly_rate %> | £<%= total_hourly_rate %> * | £<%= total_underpayment %>
+  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.total_underpayment) %>
 
   \* This figure has been rounded to the nearest penny.
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_above.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_above.govspeak.erb
index 0e58683945e..d505da3138c 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_above.govspeak.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_above.govspeak.erb
@@ -7,7 +7,7 @@
 
   The National Minimum Wage per hour at the time | The worker’s actual pay
   - | -
-  £<%= minimum_hourly_rate%> | £<%= total_hourly_rate %>
+  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %>
 
   If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_below.govspeak.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_below.govspeak.erb
index fcea08e5a2c..102d01d1f90 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_below.govspeak.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_below.govspeak.erb
@@ -6,7 +6,7 @@
 
   The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
   - | -
-  £<%= minimum_hourly_rate %> | £<%= total_hourly_rate %> * | £<%= total_underpayment %>
+  <%= format_money(calculator.minimum_hourly_rate) %> | <%= format_money(calculator.total_hourly_rate) %> * | <%= format_money(calculator.historical_adjustment) %>
 
   \* This figure has been rounded to the nearest penny.
 
diff --git a/lib/smart_answer_flows/shared_logic/minimum_wage.rb b/lib/smart_answer_flows/shared_logic/minimum_wage.rb
index a19a25e101e..735973df30c 100644
--- a/lib/smart_answer_flows/shared_logic/minimum_wage.rb
+++ b/lib/smart_answer_flows/shared_logic/minimum_wage.rb
@@ -1,13 +1,24 @@
 # Q1
 multiple_choice :what_would_you_like_to_check? do
-  option "current_payment" => :are_you_an_apprentice?
-  option "past_payment" => :past_payment_date?
-  save_input_as :current_or_past_payments
+  option "current_payment"
+  option "past_payment"
+
+  next_node do |response|
+    case response
+    when 'current_payment'
+      :are_you_an_apprentice?
+    when 'past_payment'
+      :past_payment_date?
+    end
+  end
+
+  calculate :calculator do
+    Calculators::MinimumWageCalculator.new
+  end
 end
 
 # Q1A
 multiple_choice :past_payment_date? do
-
   option "2013-10-01"
   option "2012-10-01"
   option "2011-10-01"
@@ -15,23 +26,33 @@
   option "2009-10-01"
   option "2008-10-01"
 
-  save_input_as :payment_date
-
-  next_node :were_you_an_apprentice?
+  next_node do |response|
+    calculator.date = Date.parse(response)
+    :were_you_an_apprentice?
+  end
 end
 
 # Q2
 multiple_choice :are_you_an_apprentice? do
-  save_input_as :is_apprentice
-  option "not_an_apprentice" => :how_old_are_you?
-  option "apprentice_under_19" => :how_often_do_you_get_paid?
-  option "apprentice_over_19_first_year" => :how_often_do_you_get_paid?
-  option "apprentice_over_19_second_year_onwards" => :how_old_are_you?
+  option "not_an_apprentice"
+  option "apprentice_under_19"
+  option "apprentice_over_19_first_year"
+  option "apprentice_over_19_second_year_onwards"
+
+  next_node do |response|
+    case response
+    when 'not_an_apprentice', 'apprentice_over_19_second_year_onwards'
+      calculator.is_apprentice = false
+      :how_old_are_you?
+    when 'apprentice_under_19', 'apprentice_over_19_first_year'
+      calculator.is_apprentice = true
+      :how_often_do_you_get_paid?
+    end
+  end
 end
 
 # Q2 Past
 multiple_choice :were_you_an_apprentice? do
-  save_input_as :was_apprentice
   option "no"
   option "apprentice_under_19"
   option "apprentice_over_19"
@@ -39,12 +60,14 @@
   next_node do |response|
     case response
     when "no"
+      calculator.is_apprentice = false
       :how_old_were_you?
     else
-      if Date.parse(payment_date) < Date.parse('2010-10-01')
-        :does_not_apply_to_historical_apprentices
-      else
+      calculator.is_apprentice = true
+      if calculator.apprentice_eligible_for_minimum_wage?
         :how_often_did_you_get_paid?
+      else
+        :does_not_apply_to_historical_apprentices
       end
     end
   end
@@ -52,15 +75,13 @@
 
 # Q3
 value_question :how_old_are_you?, parse: Integer do
-  calculate :age do |response|
-    age = response
-    if age <= 0 || age > 200
-      raise SmartAnswer::InvalidResponse
-    end
-    age
+  validate do |response|
+    calculator.valid_age?(response)
   end
+
   next_node do |response|
-    if response.to_i < 16
+    calculator.age = response
+    if calculator.under_school_leaving_age?
       :under_school_leaving_age
     else
       :how_often_do_you_get_paid?
@@ -70,16 +91,13 @@
 
 # Q3 Past
 value_question :how_old_were_you?, parse: Integer do
-  calculate :age do |response|
-    age = response
-    if age <= 0
-      raise SmartAnswer::InvalidResponse
-    end
-    age
+  validate do |response|
+    calculator.valid_age?(response)
   end
 
   next_node do |response|
-    if response.to_i < 16
+    calculator.age = response
+    if calculator.under_school_leaving_age?
       :under_school_leaving_age_past
     else
       :how_often_did_you_get_paid?
@@ -89,194 +107,123 @@
 
 # Q4
 value_question :how_often_do_you_get_paid?, parse: :to_i do
-  calculate :pay_frequency do |response|
-    pay_frequency = response
-    if pay_frequency < 1 or pay_frequency > 31
-      raise SmartAnswer::InvalidResponse
-    end
-    pay_frequency
+  validate do |response|
+    calculator.valid_pay_frequency?(response)
+  end
+
+  next_node do |response|
+    calculator.pay_frequency = response
+    :how_many_hours_do_you_work?
   end
-  next_node :how_many_hours_do_you_work?
 end
 
 # Q4 Past
 value_question :how_often_did_you_get_paid?, parse: :to_i do
-  calculate :pay_frequency do |response|
-    pay_frequency = response
-    if pay_frequency < 1 or pay_frequency > 31
-      raise SmartAnswer::InvalidResponse
-    end
-    pay_frequency
+  validate do |response|
+    calculator.valid_pay_frequency?(response)
+  end
+
+  next_node do |response|
+    calculator.pay_frequency = response
+    :how_many_hours_did_you_work?
   end
-  next_node :how_many_hours_did_you_work?
 end
 
 # Q5
 value_question :how_many_hours_do_you_work?, parse: Float do
-  calculate :basic_hours do |response|
-    basic_hours = response
-    if basic_hours <= 0 or basic_hours > (pay_frequency * 16)
-      raise SmartAnswer::InvalidResponse, :error_hours
-    end
-    basic_hours
+  validate(:error_hours) do |response|
+    calculator.valid_hours_worked?(response)
+  end
+
+  next_node do |response|
+    calculator.basic_hours = response
+    :how_much_are_you_paid_during_pay_period?
   end
-  next_node :how_much_are_you_paid_during_pay_period?
 end
 
 # Q5 Past
 value_question :how_many_hours_did_you_work?, parse: Float do
-  calculate :basic_hours do |response|
-    basic_hours = response
-    if basic_hours <= 0 or basic_hours > (pay_frequency * 16)
-      raise SmartAnswer::InvalidResponse, :error_hours
-    end
-    basic_hours
+  validate(:error_hours) do |response|
+    calculator.valid_hours_worked?(response)
+  end
+
+  next_node do |response|
+    calculator.basic_hours = response
+    :how_much_were_you_paid_during_pay_period?
   end
-  next_node :how_much_were_you_paid_during_pay_period?
 end
 
 # Q6
 money_question :how_much_are_you_paid_during_pay_period? do
-
-  calculate :calculator do |response|
-    amount_paid = Float(response)
-    if amount_paid < 0
-      raise SmartAnswer::InvalidResponse
-    end
-    Calculators::MinimumWageCalculator.new({
-      age: age.to_i,
-      pay_frequency: pay_frequency,
-      basic_hours: basic_hours,
-      basic_pay: amount_paid,
-      is_apprentice: (is_apprentice == 'apprentice_under_19' ||
-                      is_apprentice == 'apprentice_over_19_first_year')
-    })
+  next_node do |response|
+    calculator.basic_pay = Float(response)
+    :how_many_hours_overtime_do_you_work?
   end
-
-  next_node :how_many_hours_overtime_do_you_work?
 end
 
 # Q6 Past
 money_question :how_much_were_you_paid_during_pay_period? do
-
-  calculate :calculator do |response|
-    amount_paid = Float(response)
-    if amount_paid < 0
-      raise SmartAnswer::InvalidResponse
-    end
-    Calculators::MinimumWageCalculator.new({
-      age: age.to_i,
-      date: Date.parse(payment_date),
-      pay_frequency: pay_frequency,
-      basic_hours: basic_hours,
-      basic_pay: amount_paid,
-      is_apprentice: (was_apprentice != 'no')
-    })
+  next_node do |response|
+    calculator.basic_pay = Float(response)
+    :how_many_hours_overtime_did_you_work?
   end
-
-  next_node :how_many_hours_overtime_did_you_work?
 end
 
 # Q7
 value_question :how_many_hours_overtime_do_you_work?, parse: Float do
-
-  calculate :overtime_hours do |response|
-    overtime_hours = response
-    if overtime_hours < 0
-      raise SmartAnswer::InvalidResponse
-    end
-    calculator.overtime_hours = overtime_hours
+  validate do |response|
+    calculator.valid_overtime_hours_worked?(response)
   end
 
   next_node do |response|
-    if response.to_i == 0
-      :is_provided_with_accommodation?
-    else
+    calculator.overtime_hours = response
+    if calculator.any_overtime_hours_worked?
       :what_is_overtime_pay_per_hour?
+    else
+      :is_provided_with_accommodation?
     end
   end
 end
 
 # Q7 Past
 value_question :how_many_hours_overtime_did_you_work?, parse: Float do
-  save_input_as :overtime_hours
-
-  calculate :overtime_hours do |response|
-    overtime_hours = response
-    if overtime_hours < 0
-      raise SmartAnswer::InvalidResponse
-    end
-    calculator.overtime_hours = overtime_hours
+  validate do |response|
+    calculator.valid_overtime_hours_worked?(response)
   end
 
   next_node do |response|
-    if response.to_i == 0
-      :was_provided_with_accommodation?
-    else
+    calculator.overtime_hours = response
+    if calculator.any_overtime_hours_worked?
       :what_was_overtime_pay_per_hour?
+    else
+      :was_provided_with_accommodation?
     end
   end
 end
 
 # Q8
 money_question :what_is_overtime_pay_per_hour? do
-  save_input_as :overtime_rate
-
-  calculate :overtime_rate do |response|
-    overtime_hourly_rate = Float(response)
-    if overtime_hourly_rate < 0
-      raise SmartAnswer::InvalidResponse
-    end
-    calculator.overtime_hourly_rate = overtime_hourly_rate
+  next_node do |response|
+    calculator.overtime_hourly_rate = Float(response)
+    :is_provided_with_accommodation?
   end
-
-  next_node :is_provided_with_accommodation?
 end
 
 # Q8 Past
 money_question :what_was_overtime_pay_per_hour? do
-  save_input_as :overtime_rate
-
-  calculate :overtime_rate do |response|
-    overtime_hourly_rate = Float(response)
-    if overtime_hourly_rate < 0
-      raise SmartAnswer::InvalidResponse
-    end
-    calculator.overtime_hourly_rate = overtime_hourly_rate
+  next_node do |response|
+    calculator.overtime_hourly_rate = Float(response)
+    :was_provided_with_accommodation?
   end
-
-  next_node :was_provided_with_accommodation?
 end
 
 # Q9
 multiple_choice :is_provided_with_accommodation? do
-
   option "no"
   option "yes_free"
   option "yes_charged"
 
-  calculate :accommodation_provided do |response|
-    response != 'no'
-  end
-
-  calculate :total_hours do
-    calculator.total_hours
-  end
-
-  calculate :minimum_hourly_rate do
-    calculator.format_money calculator.minimum_hourly_rate
-  end
-
-  calculate :total_hourly_rate do
-    calculator.format_money calculator.total_hourly_rate
-  end
-
-  calculate :above_minimum_wage do
-    calculator.minimum_wage_or_above?
-  end
-
   next_node do |response|
-
     case response
     when "yes_free"
       :current_accommodation_usage?
@@ -298,28 +245,7 @@
   option "yes_free"
   option "yes_charged"
 
-  calculate :accommodation_provided do |response|
-    response != 'no'
-  end
-
-  calculate :total_hours do
-    calculator.total_hours
-  end
-
-  calculate :minimum_hourly_rate do
-    calculator.format_money calculator.minimum_hourly_rate
-  end
-
-  calculate :total_hourly_rate do
-    calculator.format_money calculator.total_hourly_rate
-  end
-
-  calculate :above_minimum_wage do
-    calculator.minimum_wage_or_above?
-  end
-
   next_node do |response|
-
     case response
     when "yes_free"
       :past_accommodation_usage?
@@ -337,169 +263,63 @@
 
 # Q10
 money_question :current_accommodation_charge? do
-  calculate :accommodation_charge do |response|
-    accommodation_charge = Float(response)
-    if accommodation_charge <= 0
-      raise SmartAnswer::InvalidResponse
-    end
-    accommodation_charge
+  validate do |response|
+    calculator.valid_accommodation_charge?(response)
   end
+
   next_node :current_accommodation_usage?
+
+  save_input_as :accommodation_charge
 end
 
 # Q10 Past
 money_question :past_accommodation_charge? do
-  calculate :accommodation_charge do |response|
-    accommodation_charge = Float(response)
-    if accommodation_charge <= 0
-      raise SmartAnswer::InvalidResponse
-    end
-    accommodation_charge
+  validate do |response|
+    calculator.valid_accommodation_charge?(response)
   end
+
   next_node :past_accommodation_usage?
+
+  save_input_as :accommodation_charge
 end
 
 # Q11
 value_question :current_accommodation_usage?, parse: Integer do
-
-  save_input_as :accommodation_usage
-
-  calculate :calculator do |response|
-    days_per_week = response
-    if days_per_week < 0 or days_per_week > 7
-      raise SmartAnswer::InvalidResponse
-    end
-    calculator.accommodation_adjustment(accommodation_charge, days_per_week)
-    calculator
-  end
-
-  calculate :total_hours do
-    calculator.total_hours
-  end
-
-  calculate :minimum_hourly_rate do
-    calculator.minimum_hourly_rate
-  end
-
-  calculate :total_hourly_rate do
-    calculator.format_money calculator.total_hourly_rate
-  end
-
-  calculate :above_minimum_wage do
-    calculator.minimum_wage_or_above?
+  validate do |response|
+    calculator.valid_accommodation_usage?(response)
   end
 
   next_node do |response|
-    calculator.accommodation_adjustment(accommodation_charge, Integer(response))
-
+    calculator.accommodation_adjustment(accommodation_charge, response)
     if calculator.minimum_wage_or_above?
       :current_payment_above
     else
       :current_payment_below
     end
-
   end
 end
 
 # Q11 Past
 value_question :past_accommodation_usage?, parse: Integer do
-
-  save_input_as :accommodation_usage
-
-  calculate :calculator do |response|
-    days_per_week = response
-    if days_per_week < 0 or days_per_week > 7
-      raise SmartAnswer::InvalidResponse
-    end
-    calculator.accommodation_adjustment(accommodation_charge, days_per_week)
-    calculator
-  end
-
-  calculate :total_hours do
-    calculator.total_hours
-  end
-
-  calculate :minimum_hourly_rate do
-    calculator.format_money calculator.minimum_hourly_rate
-  end
-
-  calculate :above_minimum_wage do
-    calculator.minimum_wage_or_above?
-  end
-
-  calculate :total_hourly_rate do
-    calculator.format_money calculator.total_hourly_rate
-  end
-
-  calculate :historical_adjustment do
-    calculator.historical_adjustment
+  validate do |response|
+    calculator.valid_accommodation_usage?(response)
   end
 
   next_node do |response|
     calculator.accommodation_adjustment(accommodation_charge, response)
-
-    if calculator.historical_adjustment <= 0
+    if calculator.historically_receiving_minimum_wage?
       :past_payment_above
     else
       :past_payment_below
     end
-
-  end
-end
-
-outcome :current_payment_above do
-  precalculate :total_working_pay do
-    calculator.total_working_pay
-  end
-  precalculate :accommodation_charged do
-    accommodation_charge and accommodation_charge > 0
-  end
-  precalculate :accommodation_rate do
-    accommodation_charged ? accommodation_charge : calculator.free_accommodation_rate
-  end
-end
-
-outcome :current_payment_below do
-  precalculate :total_working_pay do
-    calculator.total_working_pay
-  end
-  precalculate :accommodation_charged do
-    accommodation_charge and accommodation_charge > 0
-  end
-  precalculate :accommodation_rate do
-    accommodation_charged ? accommodation_charge : calculator.free_accommodation_rate
-  end
-  precalculate :total_underpayment do
-    calculator.format_money calculator.total_underpayment
   end
 end
 
-outcome :past_payment_above do
-  precalculate :total_working_pay do
-    calculator.total_working_pay
-  end
-  precalculate :accommodation_charged do
-    accommodation_charge and accommodation_charge > 0
-  end
-  precalculate :accommodation_rate do
-    accommodation_charged ? accommodation_charge : calculator.free_accommodation_rate
-  end
-end
+outcome :current_payment_above
+outcome :current_payment_below
 
-outcome :past_payment_below do
-  precalculate :total_working_pay do
-    calculator.total_working_pay
-  end
-  precalculate :accommodation_charged do
-    accommodation_charge and accommodation_charge > 0
-  end
-  precalculate :accommodation_rate do
-    accommodation_charged ? accommodation_charge : calculator.free_accommodation_rate
-  end
-  precalculate :total_underpayment do
-    calculator.format_money calculator.historical_adjustment
-  end
-end
+outcome :past_payment_above
+outcome :past_payment_below
 
 outcome :under_school_leaving_age
 outcome :does_not_apply_to_historical_apprentices
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 16e100e4849..e6b10a82dc3 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£2.73 | £-55.92 * | £938.43
+£2.73 | -£55.92 * | £938.43
 
 \* This figure has been rounded to the nearest penny.
 
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 c0d38dc8f5e..607dc7d7fe4 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£2.73 | £-35.20 * | £910.27
+£2.73 | -£35.20 * | £910.27
 
 \* This figure has been rounded to the nearest penny.
 
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 5813660c6b8..dad66587bfa 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£2.73 | £-43.42 * | £738.43
+£2.73 | -£43.42 * | £738.43
 
 \* This figure has been rounded to the nearest penny.
 
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 cdf3990fed1..352592c4838 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£2.73 | £-31.45 * | £820.27
+£2.73 | -£31.45 * | £820.27
 
 \* This figure has been rounded to the nearest penny.
 
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 80ddd8a8800..98e5f7dc27a 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.25 * | £4
+£6.50 | £6.25 * | £4
 
 \* This figure has been rounded to the nearest penny.
 
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 2c88d20ff6e..1c066122fcc 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £4.24 * | £36.12
+£6.50 | £4.24 * | £36.12
 
 \* This figure has been rounded to the nearest penny.
 
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 78b0ef56b92..cd6fba41741 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.48 * | £0.37
+£6.50 | £6.48 * | £0.37
 
 \* This figure has been rounded to the nearest penny.
 
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 c4cc94f51be..949c55a73fb 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.25 * | £6
+£6.50 | £6.25 * | £6
 
 \* This figure has been rounded to the nearest penny.
 
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 32854c46c00..db57f5a3c9f 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £4.91 * | £38.12
+£6.50 | £4.91 * | £38.12
 
 \* This figure has been rounded to the nearest penny.
 
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 60e1a94c4d9..1086648968d 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.40 * | £2.37
+£6.50 | £6.40 * | £2.37
 
 \* This figure has been rounded to the nearest penny.
 
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 3fa60d8fd4e..49206ca0a18 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £18.75
+£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/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 9ce364f8d6a..42f5fd6cb18 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £16.74
+£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/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 c5eb3623892..1a939321070 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £18.98
+£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.
 
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 f3486161b1f..eb596076a00 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £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/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 64ac8453498..5381a1aef41 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £8.66
+£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.
 
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 bfa4df171d1..b6ce7f26f4e 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £10.15
+£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.
 
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 80ddd8a8800..98e5f7dc27a 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.25 * | £4
+£6.50 | £6.25 * | £4
 
 \* This figure has been rounded to the nearest penny.
 
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 87033f9e5fb..e10ca6f16a7 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £-55.92 * | £998.75
+£6.50 | -£55.92 * | £998.75
 
 \* This figure has been rounded to the nearest penny.
 
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 853b10920f1..326dcc50a36 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £13.28
+£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.
 
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 c4cc94f51be..949c55a73fb 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.25 * | £6
+£6.50 | £6.25 * | £6
 
 \* This figure has been rounded to the nearest penny.
 
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 a41d8a7e834..c0312f7fd8f 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £-35.20 * | £1000.75
+£6.50 | -£35.20 * | £1,000.75
 
 \* This figure has been rounded to the nearest penny.
 
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 a1ab9f8f7cf..b7d9d5cbedd 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £10.94
+£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.
 
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 3fa60d8fd4e..49206ca0a18 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £18.75
+£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/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 a0122562f4f..725bc0ebe68 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £-43.42 * | £798.75
+£6.50 | -£43.42 * | £798.75
 
 \* This figure has been rounded to the nearest penny.
 
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 d19fde374c7..90b11b81e13 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £25.78
+£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.
 
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 f3486161b1f..eb596076a00 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £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/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 9d2388c4df8..e84e63e004c 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £-31.45 * | £910.75
+£6.50 | -£31.45 * | £910.75
 
 \* This figure has been rounded to the nearest penny.
 
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 b76fd7a777e..82264e5a2d5 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £14.69
+£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.
 
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 16e100e4849..e6b10a82dc3 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£2.73 | £-55.92 * | £938.43
+£2.73 | -£55.92 * | £938.43
 
 \* This figure has been rounded to the nearest penny.
 
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 c0d38dc8f5e..607dc7d7fe4 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£2.73 | £-35.20 * | £910.27
+£2.73 | -£35.20 * | £910.27
 
 \* This figure has been rounded to the nearest penny.
 
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 5813660c6b8..dad66587bfa 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£2.73 | £-43.42 * | £738.43
+£2.73 | -£43.42 * | £738.43
 
 \* This figure has been rounded to the nearest penny.
 
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 cdf3990fed1..352592c4838 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£2.73 | £-31.45 * | £820.27
+£2.73 | -£31.45 * | £820.27
 
 \* This figure has been rounded to the nearest penny.
 
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 80ddd8a8800..98e5f7dc27a 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.25 * | £4
+£6.50 | £6.25 * | £4
 
 \* This figure has been rounded to the nearest penny.
 
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 2c88d20ff6e..1c066122fcc 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £4.24 * | £36.12
+£6.50 | £4.24 * | £36.12
 
 \* This figure has been rounded to the nearest penny.
 
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 78b0ef56b92..cd6fba41741 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.48 * | £0.37
+£6.50 | £6.48 * | £0.37
 
 \* This figure has been rounded to the nearest penny.
 
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 c4cc94f51be..949c55a73fb 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.25 * | £6
+£6.50 | £6.25 * | £6
 
 \* This figure has been rounded to the nearest penny.
 
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 32854c46c00..db57f5a3c9f 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £4.91 * | £38.12
+£6.50 | £4.91 * | £38.12
 
 \* This figure has been rounded to the nearest penny.
 
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 60e1a94c4d9..1086648968d 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.40 * | £2.37
+£6.50 | £6.40 * | £2.37
 
 \* This figure has been rounded to the nearest penny.
 
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 3fa60d8fd4e..49206ca0a18 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £18.75
+£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/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 9ce364f8d6a..42f5fd6cb18 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £16.74
+£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/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 c5eb3623892..1a939321070 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £18.98
+£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.
 
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 f3486161b1f..eb596076a00 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £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/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 64ac8453498..5381a1aef41 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £8.66
+£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.
 
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 bfa4df171d1..b6ce7f26f4e 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £10.15
+£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.
 
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 80ddd8a8800..98e5f7dc27a 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.25 * | £4
+£6.50 | £6.25 * | £4
 
 \* This figure has been rounded to the nearest penny.
 
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 87033f9e5fb..e10ca6f16a7 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £-55.92 * | £998.75
+£6.50 | -£55.92 * | £998.75
 
 \* This figure has been rounded to the nearest penny.
 
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 853b10920f1..326dcc50a36 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £13.28
+£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.
 
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 c4cc94f51be..949c55a73fb 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £6.25 * | £6
+£6.50 | £6.25 * | £6
 
 \* This figure has been rounded to the nearest penny.
 
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 a41d8a7e834..c0312f7fd8f 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £-35.20 * | £1000.75
+£6.50 | -£35.20 * | £1,000.75
 
 \* This figure has been rounded to the nearest penny.
 
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 a1ab9f8f7cf..b7d9d5cbedd 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £10.94
+£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.
 
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 3fa60d8fd4e..49206ca0a18 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £18.75
+£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/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 a0122562f4f..725bc0ebe68 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £-43.42 * | £798.75
+£6.50 | -£43.42 * | £798.75
 
 \* This figure has been rounded to the nearest penny.
 
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 d19fde374c7..90b11b81e13 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £25.78
+£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.
 
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 f3486161b1f..eb596076a00 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £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/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 9d2388c4df8..e84e63e004c 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay | For each pay period your employer owes you
 - | - | -
-£6.5 | £-31.45 * | £910.75
+£6.50 | -£31.45 * | £910.75
 
 \* This figure has been rounded to the nearest penny.
 
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 b76fd7a777e..82264e5a2d5 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for your age | Your actual pay
 - | -
-£6.5 | £14.69
+£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.
 
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 bdf9bb260e1..0f5ba7c8541 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
@@ -7,7 +7,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 * | £1134.56
+£5.73 | -£56.78 * | £1,134.56
 
 \* 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_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 0158064614b..7c87902f6e8 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
@@ -7,7 +7,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 * | £1129.84
+£5.73 | -£35.77 * | £1,129.84
 
 \* 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_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 f467d19c959..61950c9a6d3 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
@@ -7,7 +7,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
+£5.73 | -£44.28 * | £907.69
 
 \* 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_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 993ae0c681a..6c3ed01e979 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
@@ -7,7 +7,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 * | £1027.75
+£5.73 | -£32.02 * | £1,027.75
 
 \* 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 01269b91579..a5b5f3e20fd 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
@@ -7,7 +7,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 * | £1120.89
+£5.80 | -£56.71 * | £1,120.89
 
 \* 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 14e011ed39c..d0916d2b73a 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
@@ -7,7 +7,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 * | £1116.86
+£5.80 | -£35.72 * | £1,116.86
 
 \* 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_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 6c11f2494bc..c86fc82f0c5 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
@@ -7,7 +7,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
+£5.80 | -£44.21 * | £896.75
 
 \* 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_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 c8abeb24523..4053bcbd149 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
@@ -7,7 +7,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 * | £1015.99
+£5.80 | -£31.97 * | £1,015.99
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index eaba1296bd3..1df68ceb8cc 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.50 | £-56.57 * | £1032.11
+£2.50 | -£56.57 * | £1,032.11
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 2e39277c3b2..c14fb6973de 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.50 | £-35.63 * | £999.35
+£2.50 | -£35.63 * | £999.35
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 4a8dff6615b..78b44e322da 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.50 | £-44.07 * | £813.71
+£2.50 | -£44.07 * | £813.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index f09d5abdd5b..68cabf88c23 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.50 | £-31.88 * | £901.07
+£2.50 | -£31.88 * | £901.07
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index eaba1296bd3..1df68ceb8cc 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.50 | £-56.57 * | £1032.11
+£2.50 | -£56.57 * | £1,032.11
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/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/past_payment/2010-10-01/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 2e39277c3b2..c14fb6973de 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/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/past_payment/2010-10-01/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.50 | £-35.63 * | £999.35
+£2.50 | -£35.63 * | £999.35
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 4a8dff6615b..78b44e322da 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.50 | £-44.07 * | £813.71
+£2.50 | -£44.07 * | £813.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/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/past_payment/2010-10-01/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index f09d5abdd5b..68cabf88c23 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2010-10-01/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/past_payment/2010-10-01/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.50 | £-31.88 * | £901.07
+£2.50 | -£31.88 * | £901.07
 
 \* 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 31f21dc1d50..a63c8add707 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
@@ -7,7 +7,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 * | £1096.17
+£5.93 | -£56.57 * | £1,096.17
 
 \* 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 eaaae8cd682..64c4cdddc1d 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
@@ -7,7 +7,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 * | £1093.36
+£5.93 | -£35.63 * | £1,093.36
 
 \* 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_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 6f08ee31138..adeccd0d792 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
@@ -7,7 +7,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
+£5.93 | -£44.07 * | £876.94
 
 \* 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_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 3ddc0ffb865..c979c9d413a 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
@@ -7,7 +7,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
+£5.93 | -£31.88 * | £994.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index e63cda8d93b..36531045562 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.60 | £-56.41 * | £991.31
+£2.60 | -£56.41 * | £991.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 96009379bdb..c63d5342b9e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.60 | £-35.52 * | £960.64
+£2.60 | -£35.52 * | £960.64
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 6f208d09c41..4cd9e922fd5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.60 | £-43.91 * | £781.31
+£2.60 | -£43.91 * | £781.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 17acab6a64a..6105008eae5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.60 | £-31.77 * | £866.15
+£2.60 | -£31.77 * | £866.15
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index e63cda8d93b..36531045562 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.60 | £-56.41 * | £991.31
+£2.60 | -£56.41 * | £991.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/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/past_payment/2011-10-01/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 96009379bdb..c63d5342b9e 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/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/past_payment/2011-10-01/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.60 | £-35.52 * | £960.64
+£2.60 | -£35.52 * | £960.64
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 6f208d09c41..4cd9e922fd5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.60 | £-43.91 * | £781.31
+£2.60 | -£43.91 * | £781.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/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/past_payment/2011-10-01/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 17acab6a64a..6105008eae5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2011-10-01/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/past_payment/2011-10-01/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.60 | £-31.77 * | £866.15
+£2.60 | -£31.77 * | £866.15
 
 \* 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 1e7b1077640..6f36a9970e6 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
@@ -7,7 +7,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 * | £1068.84
+£6.08 | -£56.41 * | £1,068.84
 
 \* 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 505fde62d47..d7adb12e60b 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
@@ -7,7 +7,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 * | £1067.39
+£6.08 | -£35.52 * | £1,067.39
 
 \* 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_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 f51eb5c4d5d..237338915ec 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
@@ -7,7 +7,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
+£6.08 | -£43.91 * | £855.03
 
 \* 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_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 21b70e2aa05..054354dde1a 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
@@ -7,7 +7,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
+£6.08 | -£31.77 * | £971.17
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 09f3e0d34a3..502bd6afbb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.65 | £-56.28 * | £971.38
+£2.65 | -£56.28 * | £971.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 667a93a0c01..3d013b1b2fe 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.65 | £-35.44 * | £941.71
+£2.65 | -£35.44 * | £941.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 604855609b0..b6ae2b0b05b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.65 | £-43.78 * | £765.34
+£2.65 | -£43.78 * | £765.34
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 974c68721e4..96fdd595de5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.65 | £-31.69 * | £848.99
+£2.65 | -£31.69 * | £848.99
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 09f3e0d34a3..502bd6afbb5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.65 | £-56.28 * | £971.38
+£2.65 | -£56.28 * | £971.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/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/past_payment/2012-10-01/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 667a93a0c01..3d013b1b2fe 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/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/past_payment/2012-10-01/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.65 | £-35.44 * | £941.71
+£2.65 | -£35.44 * | £941.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 604855609b0..b6ae2b0b05b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.65 | £-43.78 * | £765.34
+£2.65 | -£43.78 * | £765.34
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/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/past_payment/2012-10-01/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 974c68721e4..96fdd595de5 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2012-10-01/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/past_payment/2012-10-01/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.65 | £-31.69 * | £848.99
+£2.65 | -£31.69 * | £848.99
 
 \* 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 ebc890b94d5..cd98caf339e 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
@@ -7,7 +7,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 * | £1049.61
+£6.19 | -£56.28 * | £1,049.61
 
 \* 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 9af386f7752..3ffdddf0ed2 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
@@ -7,7 +7,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 * | £1049.10
+£6.19 | -£35.44 * | £1,049.10
 
 \* 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_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 67dc78997ea..8e15ba19822 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
@@ -7,7 +7,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
+£6.19 | -£43.78 * | £839.59
 
 \* 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_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 7583ca4794d..7a8fb809b4c 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
@@ -7,7 +7,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
+£6.19 | -£31.69 * | £954.60
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 6f95837e798..c07c36d8bf4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.68 | £-56.16 * | £958.96
+£2.68 | -£56.16 * | £958.96
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 3f19dbdc77c..f99c03ec5de 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.68 | £-35.35 * | £929.87
+£2.68 | -£35.35 * | £929.87
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 4e6caeaf344..cda3be861ed 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.68 | £-43.66 * | £755.23
+£2.68 | -£43.66 * | £755.23
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 941fdb607e5..5e4a4cc349b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.68 | £-31.61 * | £838.19
+£2.68 | -£31.61 * | £838.19
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 6f95837e798..c07c36d8bf4 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.68 | £-56.16 * | £958.96
+£2.68 | -£56.16 * | £958.96
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/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/past_payment/2013-10-01/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 3f19dbdc77c..f99c03ec5de 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/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/past_payment/2013-10-01/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.68 | £-35.35 * | £929.87
+£2.68 | -£35.35 * | £929.87
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 4e6caeaf344..cda3be861ed 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.68 | £-43.66 * | £755.23
+£2.68 | -£43.66 * | £755.23
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/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/past_payment/2013-10-01/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 941fdb607e5..5e4a4cc349b 100644
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2013-10-01/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/past_payment/2013-10-01/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | Your actual pay | For each pay period your employer owes you
 - | -
-£2.68 | £-31.61 * | £838.19
+£2.68 | -£31.61 * | £838.19
 
 \* 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 a99a0a08afd..316e1e3e31f 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
@@ -7,7 +7,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 * | £1029.58
+£6.31 | -£56.16 * | £1,029.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/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 c3e83438805..eeb252d7d10 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
@@ -7,7 +7,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 * | £1030.07
+£6.31 | -£35.35 * | £1,030.07
 
 \* 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_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 4cdea7f6359..24b62ec5ebc 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
@@ -7,7 +7,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
+£6.31 | -£43.66 * | £823.55
 
 \* 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_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 6ebf337b100..3d3fdd7d5f3 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
@@ -7,7 +7,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
+£6.31 | -£31.61 * | £937.36
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_first_year/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_first_year/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index ac9106dee82..fdad19370d1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_first_year/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_first_year/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $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
 - | - | -
-£2.73 | £-55.92 * | £938.43
+£2.73 | -£55.92 * | £938.43
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/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/minimum-wage-calculator-employers/current_payment/apprentice_over_19_first_year/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index b5c82f157df..3cdb0158e4f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/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/minimum-wage-calculator-employers/current_payment/apprentice_over_19_first_year/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 for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£2.73 | £-35.20 * | £910.27
+£2.73 | -£35.20 * | £910.27
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_first_year/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_first_year/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index ac2a7cf9190..87bae68d945 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_over_19_first_year/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_first_year/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $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
 - | - | -
-£2.73 | £-43.42 * | £738.43
+£2.73 | -£43.42 * | £738.43
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/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/minimum-wage-calculator-employers/current_payment/apprentice_over_19_first_year/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 78db33cad45..266287cf1c5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/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/minimum-wage-calculator-employers/current_payment/apprentice_over_19_first_year/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 for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£2.73 | £-31.45 * | £820.27
+£2.73 | -£31.45 * | £820.27
 
 \* 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 fb19869e236..965ae0199b2 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.25 * | £4
+£6.50 | £6.25 * | £4
 
 \* 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 7b1b650c113..4eb4a6fbd9f 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £4.24 * | £36.12
+£6.50 | £4.24 * | £36.12
 
 \* 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 afa1ccca41e..a96500a401d 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.48 * | £0.37
+£6.50 | £6.48 * | £0.37
 
 \* 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 4d00bb42c72..d1b618fdafe 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.25 * | £6
+£6.50 | £6.25 * | £6
 
 \* 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 17d8ef1651c..618a7f954a0 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £4.91 * | £38.12
+£6.50 | £4.91 * | £38.12
 
 \* 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 fdcdc169927..0be30df7c4e 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.40 * | £2.37
+£6.50 | £6.40 * | £2.37
 
 \* 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/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 b0db20c0c4d..490811ce46f 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £18.75
+£6.50 | £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 f87087a48f2..0faf699ad51 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £16.74
+£6.50 | £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 90e60be838a..ffe93116dbb 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £18.98
+£6.50 | £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/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 a65b9b2a8ad..617cbeb26d1 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £10
+£6.50 | £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 d93e1221b6a..e7f59b9854a 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £8.66
+£6.50 | £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 d32df088bdf..783f571e732 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £10.15
+£6.50 | £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/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 fb19869e236..965ae0199b2 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.25 * | £4
+£6.50 | £6.25 * | £4
 
 \* 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 779e8a76870..04b1aec377a 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £-55.92 * | £998.75
+£6.50 | -£55.92 * | £998.75
 
 \* 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 a783e42ecd3..b65c2d302f6 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £13.28
+£6.50 | £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/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 4d00bb42c72..d1b618fdafe 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.25 * | £6
+£6.50 | £6.25 * | £6
 
 \* 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 ea98c3004a7..d3a18b9825e 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £-35.20 * | £1000.75
+£6.50 | -£35.20 * | £1,000.75
 
 \* 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 c139f9c4930..7f3c1a01884 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £10.94
+£6.50 | £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/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 b0db20c0c4d..490811ce46f 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £18.75
+£6.50 | £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 7d497a16b0f..7498a7f8d38 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £-43.42 * | £798.75
+£6.50 | -£43.42 * | £798.75
 
 \* 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 ee7c49f882b..680b3e68121 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £25.78
+£6.50 | £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/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 a65b9b2a8ad..617cbeb26d1 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £10
+£6.50 | £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 817e7d3d0e7..52fe3b88470 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £-31.45 * | £910.75
+£6.50 | -£31.45 * | £910.75
 
 \* 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 a769323404f..5d5a7bb6e87 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £14.69
+£6.50 | £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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index ac9106dee82..fdad19370d1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $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
 - | - | -
-£2.73 | £-55.92 * | £938.43
+£2.73 | -£55.92 * | £938.43
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/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_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index b5c82f157df..3cdb0158e4f 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/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_under_19/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 for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£2.73 | £-35.20 * | £910.27
+£2.73 | -£35.20 * | £910.27
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index ac2a7cf9190..87bae68d945 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -6,7 +6,7 @@ $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
 - | - | -
-£2.73 | £-43.42 * | £738.43
+£2.73 | -£43.42 * | £738.43
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/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_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 78db33cad45..266287cf1c5 100644
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/apprentice_under_19/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_under_19/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 for the worker’s age | The worker’s actual pay | For each pay period you owe the worker
 - | - | -
-£2.73 | £-31.45 * | £820.27
+£2.73 | -£31.45 * | £820.27
 
 \* 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/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 fb19869e236..965ae0199b2 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.25 * | £4
+£6.50 | £6.25 * | £4
 
 \* 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 7b1b650c113..4eb4a6fbd9f 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £4.24 * | £36.12
+£6.50 | £4.24 * | £36.12
 
 \* 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/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 afa1ccca41e..a96500a401d 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.48 * | £0.37
+£6.50 | £6.48 * | £0.37
 
 \* 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 4d00bb42c72..d1b618fdafe 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.25 * | £6
+£6.50 | £6.25 * | £6
 
 \* 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 17d8ef1651c..618a7f954a0 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £4.91 * | £38.12
+£6.50 | £4.91 * | £38.12
 
 \* 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 fdcdc169927..0be30df7c4e 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.40 * | £2.37
+£6.50 | £6.40 * | £2.37
 
 \* 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/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 b0db20c0c4d..490811ce46f 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £18.75
+£6.50 | £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 f87087a48f2..0faf699ad51 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £16.74
+£6.50 | £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 90e60be838a..ffe93116dbb 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £18.98
+£6.50 | £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/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 a65b9b2a8ad..617cbeb26d1 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £10
+£6.50 | £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 d93e1221b6a..e7f59b9854a 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £8.66
+£6.50 | £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 d32df088bdf..783f571e732 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £10.15
+£6.50 | £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/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 fb19869e236..965ae0199b2 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.25 * | £4
+£6.50 | £6.25 * | £4
 
 \* 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 779e8a76870..04b1aec377a 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £-55.92 * | £998.75
+£6.50 | -£55.92 * | £998.75
 
 \* 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 a783e42ecd3..b65c2d302f6 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £13.28
+£6.50 | £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/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 4d00bb42c72..d1b618fdafe 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £6.25 * | £6
+£6.50 | £6.25 * | £6
 
 \* 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 ea98c3004a7..d3a18b9825e 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £-35.20 * | £1000.75
+£6.50 | -£35.20 * | £1,000.75
 
 \* 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 c139f9c4930..7f3c1a01884 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £10.94
+£6.50 | £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/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 b0db20c0c4d..490811ce46f 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £18.75
+£6.50 | £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 7d497a16b0f..7498a7f8d38 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £-43.42 * | £798.75
+£6.50 | -£43.42 * | £798.75
 
 \* 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 ee7c49f882b..680b3e68121 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £25.78
+£6.50 | £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/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 a65b9b2a8ad..617cbeb26d1 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £10
+£6.50 | £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 817e7d3d0e7..52fe3b88470 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
@@ -6,7 +6,7 @@ $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
 - | - | -
-£6.5 | £-31.45 * | £910.75
+£6.50 | -£31.45 * | £910.75
 
 \* 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 a769323404f..5d5a7bb6e87 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
@@ -6,7 +6,7 @@ $C
 
 The National Minimum Wage per hour for the worker’s age | The worker’s actual pay
 - | -
-£6.5 | £14.69
+£6.50 | £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/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 61cdb0e1db7..0532a5bf2cf 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
@@ -7,7 +7,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 * | £1134.56
+£5.73 | -£56.78 * | £1,134.56
 
 \* 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_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 a9647214ae0..e987c7e4908 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
@@ -7,7 +7,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 * | £1129.84
+£5.73 | -£35.77 * | £1,129.84
 
 \* 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_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 13ef6d1a5ee..f6145ab63ff 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
@@ -7,7 +7,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
+£5.73 | -£44.28 * | £907.69
 
 \* 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_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 8bd0d84e284..4b138f6d7b8 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
@@ -7,7 +7,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 * | £1027.75
+£5.73 | -£32.02 * | £1,027.75
 
 \* 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 73026a9311f..2f7ad8ab630 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
@@ -7,7 +7,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 * | £1120.89
+£5.80 | -£56.71 * | £1,120.89
 
 \* 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 1d884a16603..2320292163f 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
@@ -7,7 +7,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 * | £1116.86
+£5.80 | -£35.72 * | £1,116.86
 
 \* 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_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 0976e10e550..d612471d83e 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
@@ -7,7 +7,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
+£5.80 | -£44.21 * | £896.75
 
 \* 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_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 100a8d3d584..a1811bf21bc 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
@@ -7,7 +7,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 * | £1015.99
+£5.80 | -£31.97 * | £1,015.99
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 687903e066a..c0f49dc48db 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.50 | £-56.57 * | £1032.11
+£2.50 | -£56.57 * | £1,032.11
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index b53165c943e..4b582896327 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.50 | £-35.63 * | £999.35
+£2.50 | -£35.63 * | £999.35
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index fe00751e131..bebc3b052ee 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.50 | £-44.07 * | £813.71
+£2.50 | -£44.07 * | £813.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 7e31af9cf48..9839af24cb0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.50 | £-31.88 * | £901.07
+£2.50 | -£31.88 * | £901.07
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 687903e066a..c0f49dc48db 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.50 | £-56.57 * | £1032.11
+£2.50 | -£56.57 * | £1,032.11
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index b53165c943e..4b582896327 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.50 | £-35.63 * | £999.35
+£2.50 | -£35.63 * | £999.35
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index fe00751e131..bebc3b052ee 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.50 | £-44.07 * | £813.71
+£2.50 | -£44.07 * | £813.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 7e31af9cf48..9839af24cb0 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2010-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.50 | £-31.88 * | £901.07
+£2.50 | -£31.88 * | £901.07
 
 \* 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 0896168ca52..eab5c4d294d 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
@@ -7,7 +7,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 * | £1096.17
+£5.93 | -£56.57 * | £1,096.17
 
 \* 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 d6836e03f6f..3e06cd717cc 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
@@ -7,7 +7,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 * | £1093.36
+£5.93 | -£35.63 * | £1,093.36
 
 \* 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_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 232180497c9..779076acac3 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
@@ -7,7 +7,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
+£5.93 | -£44.07 * | £876.94
 
 \* 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_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 8fc1f4a5dc9..45de9ea44cc 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
@@ -7,7 +7,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
+£5.93 | -£31.88 * | £994.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 46c0cb604c1..8e9a919e6bd 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.60 | £-56.41 * | £991.31
+£2.60 | -£56.41 * | £991.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 6d38229f409..359b9e93faf 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.60 | £-35.52 * | £960.64
+£2.60 | -£35.52 * | £960.64
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index a16377fede1..f53f0815924 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.60 | £-43.91 * | £781.31
+£2.60 | -£43.91 * | £781.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 134342f278a..3603f680b08 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.60 | £-31.77 * | £866.15
+£2.60 | -£31.77 * | £866.15
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 46c0cb604c1..8e9a919e6bd 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.60 | £-56.41 * | £991.31
+£2.60 | -£56.41 * | £991.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 6d38229f409..359b9e93faf 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.60 | £-35.52 * | £960.64
+£2.60 | -£35.52 * | £960.64
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index a16377fede1..f53f0815924 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.60 | £-43.91 * | £781.31
+£2.60 | -£43.91 * | £781.31
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 134342f278a..3603f680b08 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2011-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.60 | £-31.77 * | £866.15
+£2.60 | -£31.77 * | £866.15
 
 \* 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 cbb88f30bcb..db9d765cabe 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
@@ -7,7 +7,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 * | £1068.84
+£6.08 | -£56.41 * | £1,068.84
 
 \* 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 9a5fb5ecfee..4715d8d3c25 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
@@ -7,7 +7,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 * | £1067.39
+£6.08 | -£35.52 * | £1,067.39
 
 \* 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_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 7ed1a315036..92490c768a3 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
@@ -7,7 +7,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
+£6.08 | -£43.91 * | £855.03
 
 \* 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_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 b4693928f25..7cfd5fd6631 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
@@ -7,7 +7,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
+£6.08 | -£31.77 * | £971.17
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 5aba9d94b1c..adb6cafbc57 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.65 | £-56.28 * | £971.38
+£2.65 | -£56.28 * | £971.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index c27ca7d124e..eb3b50aa426 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.65 | £-35.44 * | £941.71
+£2.65 | -£35.44 * | £941.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 9b9a519cd49..422a3e7234c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.65 | £-43.78 * | £765.34
+£2.65 | -£43.78 * | £765.34
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 7aa36ad29e1..2e2ae3b670d 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.65 | £-31.69 * | £848.99
+£2.65 | -£31.69 * | £848.99
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index 5aba9d94b1c..adb6cafbc57 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.65 | £-56.28 * | £971.38
+£2.65 | -£56.28 * | £971.38
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index c27ca7d124e..eb3b50aa426 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.65 | £-35.44 * | £941.71
+£2.65 | -£35.44 * | £941.71
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index 9b9a519cd49..422a3e7234c 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.65 | £-43.78 * | £765.34
+£2.65 | -£43.78 * | £765.34
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index 7aa36ad29e1..2e2ae3b670d 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2012-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.65 | £-31.69 * | £848.99
+£2.65 | -£31.69 * | £848.99
 
 \* 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 67957b0f715..052c29d7efc 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
@@ -7,7 +7,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 * | £1049.61
+£6.19 | -£56.28 * | £1,049.61
 
 \* 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 dd4dbe9bf40..04e925210d9 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
@@ -7,7 +7,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 * | £1049.10
+£6.19 | -£35.44 * | £1,049.10
 
 \* 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_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 5ab90195538..f730711d04c 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
@@ -7,7 +7,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
+£6.19 | -£43.78 * | £839.59
 
 \* 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_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 dba47d7bfbc..17d6471425d 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
@@ -7,7 +7,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
+£6.19 | -£31.69 * | £954.60
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index dde1e0805c4..16052cbf7e7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.68 | £-56.16 * | £958.96
+£2.68 | -£56.16 * | £958.96
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 3c35b4412e0..8429d36c49e 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.68 | £-35.35 * | £929.87
+£2.68 | -£35.35 * | £929.87
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index aee8e9f7234..175804bc7c1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.68 | £-43.66 * | £755.23
+£2.68 | -£43.66 * | £755.23
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index e48020c6430..623171af8bc 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_over_19/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/apprentice_over_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.68 | £-31.61 * | £838.19
+£2.68 | -£31.61 * | £838.19
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
index dde1e0805c4..16052cbf7e7 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.68 | £-56.16 * | £958.96
+£2.68 | -£56.16 * | £958.96
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
index 3c35b4412e0..8429d36c49e 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/100.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.68 | £-35.35 * | £929.87
+£2.68 | -£35.35 * | £929.87
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
index aee8e9f7234..175804bc7c1 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/0.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.68 | £-43.66 * | £755.23
+£2.68 | -£43.66 * | £755.23
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
index e48020c6430..623171af8bc 100644
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2013-10-01/apprentice_under_19/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/apprentice_under_19/31/16.0/300.0/8.0/10.0/yes_charged/50.0/5.txt
@@ -7,7 +7,7 @@ $C
 
 The National Minimum Wage per hour at the time | The worker’s actual pay | For each pay period you owe the worker
 - | -
-£2.68 | £-31.61 * | £838.19
+£2.68 | -£31.61 * | £838.19
 
 \* 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 3a71474802e..439d4534516 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
@@ -7,7 +7,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 * | £1029.58
+£6.31 | -£56.16 * | £1,029.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/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 77fc3865e2b..79eebfa8bde 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
@@ -7,7 +7,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 * | £1030.07
+£6.31 | -£35.35 * | £1,030.07
 
 \* 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_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 5321e20c907..365dcfe10ad 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
@@ -7,7 +7,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
+£6.31 | -£43.66 * | £823.55
 
 \* 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_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 e27c60031b6..9928169f1a9 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
@@ -7,7 +7,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
+£6.31 | -£31.61 * | £937.36
 
 \* This figure has been rounded to the nearest penny.
 
diff --git a/test/data/am-i-getting-minimum-wage-files.yml b/test/data/am-i-getting-minimum-wage-files.yml
index 3b7b0a54e2e..5bb2131b03f 100644
--- a/test/data/am-i-getting-minimum-wage-files.yml
+++ b/test/data/am-i-getting-minimum-wage-files.yml
@@ -3,14 +3,14 @@ lib/smart_answer_flows/am-i-getting-minimum-wage.rb: 840e98c92ccddb4145878d66c72
 lib/smart_answer_flows/locales/en/am-i-getting-minimum-wage.yml: 33712eff4fda6c7b7c44306f2f9491ec
 test/data/am-i-getting-minimum-wage-questions-and-responses.yml: 8d05a23bb72740b2d9c9f1196f212e0e
 test/data/am-i-getting-minimum-wage-responses-and-expected-results.yml: 4f24160d38e41983f72ce1352fad9702
-lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_above.govspeak.erb: bba094c14c31c576789d7a8713f1e54a
-lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_below.govspeak.erb: e57099063e7daed12af18dfa51c544b8
+lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_above.govspeak.erb: f2f8d1e62398cfc21c758d2761dd01f8
+lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_below.govspeak.erb: cd39c895ff58077c20f5cf1ce625bdd3
 lib/smart_answer_flows/am-i-getting-minimum-wage/does_not_apply_to_historical_apprentices.govspeak.erb: bd846fa5585f32e995c74bb714f6d600
-lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_above.govspeak.erb: 5a4f940854060dc021907b1d74e7800b
-lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_below.govspeak.erb: bd9c93838ae4531f33d0e1f9493fa8bb
+lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_above.govspeak.erb: 36413c88f0dd849c8dbda0a41584cab5
+lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_below.govspeak.erb: a1e7908ab88a996e5229620fb006321d
 lib/smart_answer_flows/am-i-getting-minimum-wage/under_school_leaving_age.govspeak.erb: 44bf68757d1ef90249d19f5d88ad4bc2
 lib/smart_answer_flows/am-i-getting-minimum-wage/under_school_leaving_age_past.govspeak.erb: 2182c103915b753894722760c9a56cf3
 lib/smart_answer_flows/shared/minimum_wage/_acas_information.govspeak.erb: 0d2f7c4d01e3c928701e7d649663707e
-lib/smart_answer_flows/shared_logic/minimum_wage.rb: 0b04eddea8ce323c7a6b3bdf38e85b7c
-lib/smart_answer/calculators/minimum_wage_calculator.rb: 8f2af19b8bee681ac27fae1874e95460
+lib/smart_answer_flows/shared_logic/minimum_wage.rb: 845ab4517525af663334699e0b0308d9
+lib/smart_answer/calculators/minimum_wage_calculator.rb: cab354bb2fc0f660d6c6aef70b9fabc5
 lib/data/minimum_wage_data.yml: 55c71c9ff8252c17a679dad888ad5ad7
diff --git a/test/data/minimum-wage-calculator-employers-files.yml b/test/data/minimum-wage-calculator-employers-files.yml
index ab7f89cd327..bdefc81f2fd 100644
--- a/test/data/minimum-wage-calculator-employers-files.yml
+++ b/test/data/minimum-wage-calculator-employers-files.yml
@@ -3,14 +3,14 @@ lib/smart_answer_flows/minimum-wage-calculator-employers.rb: aa193c977054901f9db
 lib/smart_answer_flows/locales/en/minimum-wage-calculator-employers.yml: 1d69047c9eda71bf80fc761516b0e90e
 test/data/minimum-wage-calculator-employers-questions-and-responses.yml: 8d05a23bb72740b2d9c9f1196f212e0e
 test/data/minimum-wage-calculator-employers-responses-and-expected-results.yml: 4f24160d38e41983f72ce1352fad9702
-lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_above.govspeak.erb: 4a33a726da01da0015e6f42f10e49e1c
-lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_below.govspeak.erb: b7cb141635eba3e83d09591c77ffeec9
+lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_above.govspeak.erb: ee8b1753fd772f0288d637d7b2732275
+lib/smart_answer_flows/minimum-wage-calculator-employers/current_payment_below.govspeak.erb: 315703c1c8cfa949a152c8479318cc1f
 lib/smart_answer_flows/minimum-wage-calculator-employers/does_not_apply_to_historical_apprentices.govspeak.erb: b7db231cc648b8b6abc846efd5a840ff
-lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_above.govspeak.erb: 77233c3e86ffd2ceef2f079fe5c7f30c
-lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_below.govspeak.erb: 959ef7ebf27b103f8b60af658b4d6609
+lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_above.govspeak.erb: 8b56fbd822fc6e5f37ec03a08dca85e5
+lib/smart_answer_flows/minimum-wage-calculator-employers/past_payment_below.govspeak.erb: c2b6f623b0c71a74fd7cd1bde01f51e4
 lib/smart_answer_flows/minimum-wage-calculator-employers/under_school_leaving_age.govspeak.erb: 13de5d10bbbb015df597f78c66da1b67
 lib/smart_answer_flows/minimum-wage-calculator-employers/under_school_leaving_age_past.govspeak.erb: 9c56f76e04984f07627efbc1f42b2b63
 lib/smart_answer_flows/shared/minimum_wage/_acas_information.govspeak.erb: 0d2f7c4d01e3c928701e7d649663707e
-lib/smart_answer_flows/shared_logic/minimum_wage.rb: 0b04eddea8ce323c7a6b3bdf38e85b7c
-lib/smart_answer/calculators/minimum_wage_calculator.rb: 8f2af19b8bee681ac27fae1874e95460
+lib/smart_answer_flows/shared_logic/minimum_wage.rb: 845ab4517525af663334699e0b0308d9
+lib/smart_answer/calculators/minimum_wage_calculator.rb: cab354bb2fc0f660d6c6aef70b9fabc5
 lib/data/minimum_wage_data.yml: 55c71c9ff8252c17a679dad888ad5ad7
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 2f6021c23ca..318e0548c3a 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
@@ -62,7 +62,7 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
           add_response "no"
         end
         should "show current minimum wage rate" do
-          assert_state_variable "minimum_hourly_rate", "6.50"
+          assert_equal 6.50, current_state.calculator.minimum_hourly_rate
         end
       end
     end
@@ -86,19 +86,6 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
         end
       end
 
-      context "answer invalid for Q3 how old" do
-        should "not accept 0 age" do
-          add_response 0
-          assert_current_node :how_old_are_you?, error: true
-        end
-
-        should "not accept age > 200" do
-          add_response 250
-          assert_current_node :how_old_are_you?, error: true
-        end
-
-      end
-
       context "answered 19 to 'how old are you?'" do
         setup do
           add_response 19
@@ -128,10 +115,6 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
               add_response "no numbers"
               assert_current_node_is_error
             end
-            should "fail if 0 entered" do
-              add_response "0"
-              assert_current_node_is_error
-            end
             should "succeed on 0.01 entered" do
               add_response "0.01"
             end
@@ -286,10 +269,10 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
           assert_current_node :current_payment_below
         end
         should "make outcome calculations" do
-          assert_state_variable "total_hours", 45
-          assert_state_variable "minimum_hourly_rate", 6.5
-          assert_state_variable "total_hourly_rate", "6.12"
-          assert_state_variable "above_minimum_wage", false
+          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
 
@@ -305,7 +288,7 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
           add_response "no"
         end
         should "show current minimum wage rate" do
-          assert_state_variable "minimum_hourly_rate", "6.31"
+          assert_equal 6.31, current_state.calculator.minimum_hourly_rate
         end
       end
 
@@ -320,7 +303,7 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
           add_response "no"
         end
         should "show current minimum wage rate" do
-          assert_state_variable "minimum_hourly_rate", "6.50"
+          assert_equal 6.50, current_state.calculator.minimum_hourly_rate
         end
       end
 
@@ -340,11 +323,11 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
           assert_current_node :current_payment_above
         end
         should "make outcome calculations" do
-          assert_state_variable "total_hours", 45
+          assert_equal 45, current_state.calculator.total_hours
           # NOTE: these are date sensitive vars - will be tested in the calculator tests
           # assert_state_variable "minimum_hourly_rate", 6.08 #
           # assert_state_variable "total_hourly_rate", "10.74" # time sensitive
-          assert_state_variable "above_minimum_wage", true
+          assert_equal true, current_state.calculator.minimum_wage_or_above?
         end
       end
     end # Apprentice
@@ -431,10 +414,6 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
               add_response "no numbers"
               assert_current_node_is_error
             end
-            should "fail if 0 entered" do
-              add_response "0"
-              assert_current_node_is_error
-            end
             should "succeed on 0.01 entered" do
               add_response "0.01"
             end
@@ -533,10 +512,10 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
                         end
 
                         should "make outcome calculations" do
-                          assert_state_variable "total_hours", 42
-                          assert_state_variable "minimum_hourly_rate", "4.83"
-                          assert_state_variable "total_hourly_rate", "3.75"
-                          assert_state_variable "above_minimum_wage", false
+                          assert_equal 42, current_state.calculator.total_hours
+                          assert_equal 4.83, current_state.calculator.minimum_hourly_rate
+                          assert_equal 3.75, current_state.calculator.total_hourly_rate
+                          assert_equal false, current_state.calculator.minimum_wage_or_above?
                         end
                       end
                     end
@@ -597,11 +576,11 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
           assert_current_node :past_payment_above
         end
         should "make outcome calculations" do
-          assert_state_variable "total_hours", 210
-          assert_state_variable "minimum_hourly_rate", "3.53"
-          assert_state_variable "total_hourly_rate", "4.46"
-          assert_state_variable "above_minimum_wage", true
-          assert_state_variable "historical_adjustment", 0
+          assert_equal 210, current_state.calculator.total_hours
+          assert_equal 3.53, current_state.calculator.minimum_hourly_rate
+          assert_equal 4.46, current_state.calculator.total_hourly_rate
+          assert_equal true, current_state.calculator.minimum_wage_or_above?
+          assert_equal 0, current_state.calculator.historical_adjustment
         end
       end
       # Scenario 12 in accommodation charged above the threshold
@@ -615,11 +594,11 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
           assert_current_node :past_payment_below
         end
         should "make outcome calculations" do
-          assert_state_variable "total_hours", 210
-          assert_state_variable "minimum_hourly_rate", "3.53"
-          assert_state_variable "total_hourly_rate", "3.21"
-          assert_state_variable "above_minimum_wage", false
-          assert_state_variable "historical_adjustment", 70.38
+          assert_equal 210, current_state.calculator.total_hours
+          assert_equal 3.53, current_state.calculator.minimum_hourly_rate
+          assert_equal 3.21, current_state.calculator.total_hourly_rate
+          assert_equal false, current_state.calculator.minimum_wage_or_above?
+          assert_equal 70.38, current_state.calculator.historical_adjustment
         end
       end
 
@@ -660,12 +639,12 @@ class AmIGettingMinimumWageTest < ActiveSupport::TestCase
       add_response 'no'
 
       assert_current_node :past_payment_below
-      assert_state_variable :minimum_hourly_rate, '6.08' # rate on '2011-10-01'
+      assert_equal 6.08, current_state.calculator.minimum_hourly_rate # rate on '2011-10-01'
 
-      expected_underpayment = 46.18.to_s
+      expected_underpayment = 46.18
       # (hours worked * hourly rate back then - paid by employer) / minimum hourly rate back then * minimum hourly rate today
       # (40h * £6.08 - £200.0) / 6.08 * 6.50 = 46.18
-      assert_state_variable :total_underpayment, expected_underpayment
+      assert_equal expected_underpayment, current_state.calculator.historical_adjustment
     end
   end
 end
diff --git a/test/unit/calculators/minimum_wage_calculator_test.rb b/test/unit/calculators/minimum_wage_calculator_test.rb
index 2cd6b31dc4d..ea9f28577b6 100644
--- a/test/unit/calculators/minimum_wage_calculator_test.rb
+++ b/test/unit/calculators/minimum_wage_calculator_test.rb
@@ -2,6 +2,167 @@
 
 module SmartAnswer::Calculators
   class MinimumWageCalculatorTest < ActiveSupport::TestCase
+    context "Validation" do
+      setup do
+        @calculator = MinimumWageCalculator.new
+      end
+
+      context 'for age' do
+        should 'not accept ages less than or equal to 0' do
+          refute @calculator.valid_age?(0)
+        end
+
+        should 'not accept ages greater than 200' do
+          refute @calculator.valid_age?(201)
+        end
+
+        should 'accept ages between 1 and 200' do
+          assert @calculator.valid_age?(1)
+          assert @calculator.valid_age?(200)
+        end
+      end
+
+      context 'for pay frequency' do
+        should 'not accept frequency less than 1' do
+          refute @calculator.valid_pay_frequency?(0)
+        end
+
+        should 'not accept frequency greater than 31' do
+          refute @calculator.valid_pay_frequency?(32)
+        end
+
+        should 'accept frequency between 1 and 31' do
+          assert @calculator.valid_pay_frequency?(1)
+          assert @calculator.valid_pay_frequency?(31)
+        end
+      end
+
+      context 'for hours worked' do
+        setup do
+          @calculator.pay_frequency = 1
+        end
+
+        should 'not accept hours less than 0' do
+          refute @calculator.valid_hours_worked?(0)
+        end
+
+        should 'not accept hours greater than 16 times the pay frequency' do
+          invalid_hours = (16 * @calculator.pay_frequency) + 1
+          refute @calculator.valid_hours_worked?(invalid_hours)
+        end
+
+        should 'accept hours greater than or equal to 1' do
+          assert @calculator.valid_hours_worked?(1)
+        end
+
+        should 'accept hours less than or equal to 16 times the pay frequency' do
+          valid_hours = 16 * @calculator.pay_frequency
+          assert @calculator.valid_hours_worked?(valid_hours)
+        end
+      end
+
+      context 'for overtime hours worked' do
+        should 'not accept amount less than 0' do
+          refute @calculator.valid_overtime_hours_worked?(-1)
+        end
+
+        should 'accept 0 or more' do
+          assert @calculator.valid_overtime_hours_worked?(0)
+        end
+      end
+
+      context 'for accommodation charge' do
+        should 'not accept amount less than or equal to 0' do
+          refute @calculator.valid_accommodation_charge?(0)
+        end
+
+        should 'accept 1 or more' do
+          assert @calculator.valid_accommodation_charge?(1)
+        end
+      end
+
+      context 'for accommodation usage' do
+        should 'not accept days per week of less than or equal to -1' do
+          refute @calculator.valid_accommodation_usage?(-1)
+        end
+
+        should 'not accept days per week of greater than or equal to 8' do
+          refute @calculator.valid_accommodation_usage?(8)
+        end
+
+        should 'accept days per week greater than or equal to 0' do
+          assert @calculator.valid_accommodation_usage?(0)
+        end
+
+        should 'accept days per week less than or equal to 7' do
+          assert @calculator.valid_accommodation_usage?(7)
+        end
+      end
+    end
+
+    context '#any_overtime_hours_worked?' do
+      setup do
+        @calculator = MinimumWageCalculator.new
+      end
+
+      should 'return true if overtime_hours is greater than 0' do
+        @calculator.overtime_hours = 1
+        assert @calculator.any_overtime_hours_worked?
+      end
+
+      should 'return false if overtime hours is 0' do
+        @calculator.overtime_hours = 0
+        refute @calculator.any_overtime_hours_worked?
+      end
+    end
+
+    context "#apprentice_eligible_for_minimum_wage?" do
+      setup do
+        @calculator = MinimumWageCalculator.new
+      end
+
+      should 'return true if date is equal to or later than 1st October 2010' do
+        @calculator.date = Date.parse('2010-10-01')
+        assert @calculator.apprentice_eligible_for_minimum_wage?
+      end
+
+      should 'return false if date is earlier than 1st October 2010' do
+        @calculator.date = Date.parse('2010-09-30')
+        refute @calculator.apprentice_eligible_for_minimum_wage?
+      end
+    end
+
+    context '#under_school_leaving_age?' do
+      setup do
+        @calculator = MinimumWageCalculator.new
+      end
+
+      should 'return true if age is lower than 16' do
+        @calculator.age = 15
+        assert @calculator.under_school_leaving_age?
+      end
+
+      should 'return false if age is greater than or equal to 16' do
+        @calculator.age = 16
+        refute @calculator.under_school_leaving_age?
+      end
+    end
+
+    context '#historically_receiving_minimum_wage?' do
+      setup do
+        @calculator = MinimumWageCalculator.new
+      end
+
+      should 'return true if the historical adjustment is less than or equal to 0' do
+        @calculator.stubs(:historical_adjustment).returns(0)
+        assert @calculator.historically_receiving_minimum_wage?
+      end
+
+      should 'return false if the historical adjustment is greater than 0' do
+        @calculator.stubs(:historical_adjustment).returns(1)
+        refute @calculator.historically_receiving_minimum_wage?
+      end
+    end
 
     context "MinimumWageCalculator" do
       setup do
@@ -18,12 +179,6 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
         end
       end
 
-      context "format_money" do
-        should "format values to 2 decimal places with zero padding" do
-          assert_equal "4.40", @calculator.format_money(4.4)
-        end
-      end
-
       context "minimum_wage_data_for_date" do
         should "retrieve a map of historical minimum wage data" do
           assert_equal 4.91, @calculator.minimum_wage_data_for_date(Date.parse("2013-10-01"))[:accommodation_rate]
@@ -584,20 +739,12 @@ class MinimumWageCalculatorTest < ActiveSupport::TestCase
       end
     end
 
-    context "total_pay, total_working_pay and basic_rate calculations" do
+    context "total_pay and basic_rate calculations" do
       setup do
         @calculator = MinimumWageCalculator.new(
           age: 25, pay_frequency: 5, basic_pay: 260, basic_hours: 40)
       end
 
-      should "calculate total_working_pay" do
-        assert_equal 260, @calculator.total_working_pay
-        @calculator.overtime_hours = 10
-        @calculator.overtime_hourly_rate = 7
-        # Basic rate is used for overtime pay calc
-        assert_equal 325, @calculator.total_working_pay
-      end
-
       should "return overtime (5) as the lower rate" do
         @calculator.overtime_hours = 10
         @calculator.overtime_hourly_rate = 5
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
new file mode 100644
index 00000000000..9c0a0d0c94d
--- /dev/null
+++ b/test/unit/smart_answer_flows/am_i_getting_minimum_wage_flow_test.rb
@@ -0,0 +1,223 @@
+require_relative '../../test_helper'
+
+require 'smart_answer_flows/am-i-getting-minimum-wage'
+
+module SmartAnswer
+  class AmIGettingMinimumWageFlowTest < ActiveSupport::TestCase
+    setup do
+      @flow = AmIGettingMinimumWageFlow.build
+    end
+
+    context 'validation' do
+      [
+        :how_old_are_you?,
+        :how_old_were_you?
+      ].each do |age_question_name|
+        context "for #{age_question_name}" do
+          setup do
+            @question = @flow.node(age_question_name)
+            @state = SmartAnswer::State.new(@question)
+            @calculator = stub('calculator',
+              :age= => nil,
+              :under_school_leaving_age? => nil
+            )
+            @state.calculator = @calculator
+          end
+
+          should 'raise if the calculator says the age is invalid' do
+            invalid_age = 0
+            @calculator.stubs(:valid_age?).with(invalid_age).returns(false)
+            assert_raise(SmartAnswer::InvalidResponse) do
+              @question.transition(@state, invalid_age)
+            end
+          end
+
+          should 'not raise if the calculator says the age is valid' do
+            valid_age = 50
+            @calculator.stubs(:valid_age?).with(valid_age).returns(true)
+            assert_nothing_raised do
+              @question.transition(@state, valid_age)
+            end
+          end
+        end
+      end
+
+      [
+        :how_often_do_you_get_paid?,
+        :how_often_did_you_get_paid?
+      ].each do |pay_frequency_question_name|
+        context "for #{pay_frequency_question_name}" do
+          setup do
+            @question = @flow.node(pay_frequency_question_name)
+            @state = SmartAnswer::State.new(@question)
+            @calculator = stub('calculator',
+              :pay_frequency= => nil
+            )
+            @state.calculator = @calculator
+          end
+
+          should 'raise if the calculator says the pay_frequency is invalid' do
+            invalid_pay_frequency = 3
+            @calculator.stubs(:valid_pay_frequency?).with(invalid_pay_frequency).returns(false)
+            assert_raise(SmartAnswer::InvalidResponse) do
+              @question.transition(@state, invalid_pay_frequency)
+            end
+          end
+
+          should 'not raise if the calculator says the pay_frequency is valid' do
+            valid_pay_frequency = 4
+            @calculator.stubs(:valid_pay_frequency?).with(valid_pay_frequency).returns(true)
+            assert_nothing_raised do
+              @question.transition(@state, valid_pay_frequency)
+            end
+          end
+        end
+      end
+
+      [
+        :how_many_hours_do_you_work?,
+        :how_many_hours_did_you_work?
+      ].each do |hours_question_name|
+        context "for #{hours_question_name}" do
+          setup do
+            @question = @flow.node(hours_question_name)
+            @state = SmartAnswer::State.new(@question)
+            @calculator = stub('calculator',
+              pay_frequency: 1,
+              :basic_hours= => nil
+            )
+            @state.calculator = @calculator
+          end
+
+          should 'use the error_hours error message' do
+            @calculator.stubs(:valid_hours_worked?).returns(false)
+            exception = assert_raise(SmartAnswer::InvalidResponse) do
+              @question.transition(@state, '0')
+            end
+            assert_equal 'error_hours', exception.message
+          end
+
+          should 'raise if the calculator says the hours_worked is invalid' do
+            invalid_hours_worked = 3
+            @calculator.stubs(:valid_hours_worked?).with(invalid_hours_worked).returns(false)
+
+            assert_raise(SmartAnswer::InvalidResponse) do
+              @question.transition(@state, invalid_hours_worked)
+            end
+          end
+
+          should 'not raise if the calculator says the hours_worked is valid' do
+            valid_hours_worked = 4
+            @calculator.stubs(:valid_hours_worked?).with(valid_hours_worked).returns(true)
+
+            assert_nothing_raised do
+              @question.transition(@state, valid_hours_worked)
+            end
+          end
+        end
+      end
+
+      [
+        :how_many_hours_overtime_do_you_work?,
+        :how_many_hours_overtime_did_you_work?
+      ].each do |overtime_hours_question_name|
+        context "for #{overtime_hours_question_name}" do
+          setup do
+            @question = @flow.node(overtime_hours_question_name)
+            @state = SmartAnswer::State.new(@question)
+            @calculator = stub('calculator',
+              :overtime_hours= => nil,
+              :any_overtime_hours_worked? => nil)
+            @state.calculator = @calculator
+          end
+
+          should 'raise if the calculator says the overtime_hours_worked is invalid' do
+            invalid_overtime_hours_worked = 3
+            @calculator.stubs(:valid_overtime_hours_worked?).with(invalid_overtime_hours_worked).returns(false)
+
+            assert_raise(SmartAnswer::InvalidResponse) do
+              @question.transition(@state, invalid_overtime_hours_worked)
+            end
+          end
+
+          should 'not raise if the calculator says the hours_worked is valid' do
+            valid_overtime_hours_worked = 4
+            @calculator.stubs(:valid_overtime_hours_worked?).with(valid_overtime_hours_worked).returns(true)
+
+            assert_nothing_raised do
+              @question.transition(@state, valid_overtime_hours_worked)
+            end
+          end
+        end
+      end
+
+      [
+        :current_accommodation_charge?,
+        :past_accommodation_charge?
+      ].each do |accommodation_charge_question_name|
+        context "for #{accommodation_charge_question_name}" do
+          setup do
+            @question = @flow.node(accommodation_charge_question_name)
+            @state = SmartAnswer::State.new(@question)
+            @calculator = stub('calculator')
+            @state.calculator = @calculator
+          end
+
+          should 'raise if the calculator says the accommodation_charge is invalid' do
+            invalid_accommodation_charge = 3
+            @calculator.stubs(:valid_accommodation_charge?).with(invalid_accommodation_charge).returns(false)
+
+            assert_raise(SmartAnswer::InvalidResponse) do
+              @question.transition(@state, invalid_accommodation_charge)
+            end
+          end
+
+          should 'not raise if the calculator says the accommodation_charge is valid' do
+            valid_accommodation_charge = 4
+            @calculator.stubs(:valid_accommodation_charge?).with(valid_accommodation_charge).returns(true)
+
+            assert_nothing_raised do
+              @question.transition(@state, valid_accommodation_charge)
+            end
+          end
+        end
+      end
+
+      [
+        :current_accommodation_usage?,
+        :past_accommodation_usage?
+      ].each do |accommodation_usage_question_name|
+        context "for #{accommodation_usage_question_name}" do
+          setup do
+            @question = @flow.node(accommodation_usage_question_name)
+            @state = SmartAnswer::State.new(@question)
+            @calculator = stub('calculator',
+              accommodation_adjustment: nil,
+              minimum_wage_or_above?: nil,
+              historically_receiving_minimum_wage?: nil
+            )
+            @state.calculator = @calculator
+          end
+
+          should 'raise if the calculator says the accommodation_usage is invalid' do
+            invalid_accommodation_usage = 3
+            @calculator.stubs(:valid_accommodation_usage?).with(invalid_accommodation_usage).returns(false)
+
+            assert_raise(SmartAnswer::InvalidResponse) do
+              @question.transition(@state, invalid_accommodation_usage)
+            end
+          end
+
+          should 'not raise if the calculator says the accommodation_usage is valid' do
+            valid_accommodation_usage = 4
+            @calculator.stubs(:valid_accommodation_usage?).with(valid_accommodation_usage).returns(true)
+
+            assert_nothing_raised do
+              @question.transition(@state, valid_accommodation_usage)
+            end
+          end
+        end
+      end
+    end
+  end
+end