diff --git a/app/controllers/smart_answers_controller.rb b/app/controllers/smart_answers_controller.rb
index bbb4f4c5264..0089f2b5d10 100644
--- a/app/controllers/smart_answers_controller.rb
+++ b/app/controllers/smart_answers_controller.rb
@@ -24,7 +24,7 @@ def show
           title: @presenter.current_node.title
         }
       }
-      if render_text?(@presenter)
+      if Rails.application.config.expose_govspeak
         format.text {
           render
         }
@@ -58,10 +58,6 @@ def json_request?
     request.format == Mime::JSON
   end
 
-  def render_text?(presenter)
-    Rails.application.config.expose_govspeak && presenter.render_txt?
-  end
-
   def with_format(format, &block)
     old_formats = self.formats
     self.formats = [format]
diff --git a/app/presenters/checkbox_question_presenter.rb b/app/presenters/checkbox_question_presenter.rb
index 879f1eeefcf..b2387f61cc0 100644
--- a/app/presenters/checkbox_question_presenter.rb
+++ b/app/presenters/checkbox_question_presenter.rb
@@ -1,4 +1,4 @@
-class CheckboxQuestionPresenter < QuestionPresenter
+class CheckboxQuestionPresenter < QuestionWithOptionsPresenter
   def response_labels(values)
     values.split(',').map do |value|
       if value == SmartAnswer::Question::Checkbox::NONE_OPTION
diff --git a/app/presenters/country_select_question_presenter.rb b/app/presenters/country_select_question_presenter.rb
index 917e1ca8c9d..0b345a338ee 100644
--- a/app/presenters/country_select_question_presenter.rb
+++ b/app/presenters/country_select_question_presenter.rb
@@ -1,9 +1,11 @@
 class CountrySelectQuestionPresenter < QuestionPresenter
   def response_label(value)
-    options.find { |option| option.slug == value }.name
+    options.find { |option| option.value == value }.label
   end
 
   def options
-    @node.options
+    @node.options.map do |option|
+      OpenStruct.new(label: option.name, value: option.slug)
+    end
   end
 end
diff --git a/app/presenters/flow_presenter.rb b/app/presenters/flow_presenter.rb
index 9ae87112c87..64411f0099e 100644
--- a/app/presenters/flow_presenter.rb
+++ b/app/presenters/flow_presenter.rb
@@ -33,10 +33,6 @@ def finished?
     current_node.outcome?
   end
 
-  def render_txt?
-    finished? || !started?
-  end
-
   def current_state
     @current_state ||= @flow.process(all_responses)
   end
diff --git a/app/presenters/multiple_choice_question_presenter.rb b/app/presenters/multiple_choice_question_presenter.rb
index 00a462876ef..cbd9b419ee6 100644
--- a/app/presenters/multiple_choice_question_presenter.rb
+++ b/app/presenters/multiple_choice_question_presenter.rb
@@ -1,4 +1,4 @@
-class MultipleChoiceQuestionPresenter < QuestionPresenter
+class MultipleChoiceQuestionPresenter < QuestionWithOptionsPresenter
   def response_label(value)
     options.find { |option| option.value == value }.label
   end
diff --git a/app/presenters/question_presenter.rb b/app/presenters/question_presenter.rb
index 5591ec0e876..00fe89770b1 100644
--- a/app/presenters/question_presenter.rb
+++ b/app/presenters/question_presenter.rb
@@ -46,18 +46,12 @@ def body(html: true)
     @renderer.content_for(:body, html: html)
   end
 
-  def post_body
-    @renderer.content_for(:post_body, html: true)
+  def post_body(html: true)
+    @renderer.content_for(:post_body, html: html)
   end
 
   def options
-    @node.options.map do |option|
-      OpenStruct.new(label: render_option(option), value: option)
-    end
-  end
-
-  def render_option(key)
-    @renderer.option_text(key.to_sym)
+    []
   end
 
   def to_response(input)
diff --git a/app/presenters/question_with_options_presenter.rb b/app/presenters/question_with_options_presenter.rb
new file mode 100644
index 00000000000..5871d5e74a9
--- /dev/null
+++ b/app/presenters/question_with_options_presenter.rb
@@ -0,0 +1,11 @@
+class QuestionWithOptionsPresenter < QuestionPresenter
+  def options
+    @node.options.map do |option|
+      OpenStruct.new(label: render_option(option), value: option)
+    end
+  end
+
+  def render_option(key)
+    @renderer.option_text(key.to_sym)
+  end
+end
diff --git a/app/views/smart_answers/inputs/_country_select_question.html.erb b/app/views/smart_answers/inputs/_country_select_question.html.erb
index 82c49deb890..32c39ea7b03 100644
--- a/app/views/smart_answers/inputs/_country_select_question.html.erb
+++ b/app/views/smart_answers/inputs/_country_select_question.html.erb
@@ -1 +1 @@
-<%= select_tag "response", options_from_collection_for_select(question.options, :slug, :name, prefill_value_for(question)) %>
+<%= select_tag "response", options_from_collection_for_select(question.options, :value, :label, prefill_value_for(question)) %>
diff --git a/app/views/smart_answers/show.text.erb b/app/views/smart_answers/show.text.erb
index b139cab7a12..5e86706ae24 100644
--- a/app/views/smart_answers/show.text.erb
+++ b/app/views/smart_answers/show.text.erb
@@ -10,4 +10,20 @@
 <%= @presenter.current_node.body(html: false) %>
 
 <%= @presenter.current_node.next_steps(html: false) %>
+<% else %>
+<%= @presenter.current_node.title %>
+
+<%= @presenter.current_node.body(html: false) %>
+
+<%= @presenter.current_node.hint %>
+
+<% @presenter.current_node.options.each do |option| %>
+  * <%= option.value %>: <%= option.label %>
+<% end -%>
+
+<%= @presenter.current_node.label %>
+
+<%= @presenter.current_node.suffix_label %>
+
+<%= @presenter.current_node.post_body(html: false) %>
 <% end %>
diff --git a/doc/viewing-templates-as-govspeak.md b/doc/viewing-templates-as-govspeak.md
index 5afd39370b6..5f9d5f205de 100644
--- a/doc/viewing-templates-as-govspeak.md
+++ b/doc/viewing-templates-as-govspeak.md
@@ -1,14 +1,20 @@
 # Viewing a Smart Answer as Govspeak
 
-Seeing [Govspeak](https://github.com/alphagov/govspeak) markup of Smart Answer pages can be useful to content designers when preparing content change requests or developers inspecting generated Govspeak that later gets translated to HTML. This feature can be enabled by setting `EXPOSE_GOVSPEAK` to a non-empty value. It can be accessed by appending `.txt` to URLs (currently govspeak is available for landing and outcome pages, but not question pages).
+Seeing [Govspeak](https://github.com/alphagov/govspeak) markup of Smart Answer pages can be useful to content designers when preparing content change requests or to developers inspecting generated Govspeak that later gets translated to HTML.
 
-## In Development
+This feature can be enabled by setting `EXPOSE_GOVSPEAK` to a non-empty value. It is enabled by default in the Integration environment and in Heroku apps deployed via the `startup_heroku.sh` script.
+
+The Govspeak version of the pages can be accessed by appending `.txt` to URLs.
+
+## In Development environment
 
 * [Marriage abroad landing page](http://smartanswers.dev.gov.uk/marriage-abroad.txt)
+* [Marriage abroad question page](http://smart-answers.dev.gov.uk/marriage-abroad/y.txt)
 * [Marriage abroad outcome page](http://smartanswers.dev.gov.uk/marriage-abroad/y/afghanistan/uk/partner_other/opposite_sex.txt)
 
 ## In Integration environment
 
-**Only outcomes pages can be rendered as Govspeak in Integration**. There's a [Trello card about this inconsistency](https://trello.com/c/qd5C7qDn/165-allow-landing-pages-to-be-rendered-as-govspeak-in-integration).
+**It's not currently possible to access the Govspeak version of landing pages in the Integration environment.** There's a [Trello card about this inconsistency](https://trello.com/c/qd5C7qDn/165-allow-landing-pages-to-be-rendered-as-govspeak-in-integration).
 
+* [Marriage abroad question page](https://www-origin.integration.publishing.service.gov.uk/marriage-abroad/y.txt)
 * [Marriage abroad outcome page](https://www-origin.integration.publishing.service.gov.uk/marriage-abroad/y/afghanistan/uk/partner_other/opposite_sex.txt)
diff --git a/lib/smart_answer_test_helper.rb b/lib/smart_answer_test_helper.rb
index ad2016c6edf..a650f259954 100644
--- a/lib/smart_answer_test_helper.rb
+++ b/lib/smart_answer_test_helper.rb
@@ -94,8 +94,8 @@ def path_to_outputs_for_flow
     artefacts_path.join(@flow_name)
   end
 
-  def save_output(responses, response, extension: 'txt')
-    filename = "#{responses.pop}.#{extension}"
+  def save_output(responses, response)
+    filename = "#{responses.pop}.txt"
     path_to_output_directory = path_to_outputs_for_flow.join(*responses)
     FileUtils.mkdir_p(path_to_output_directory)
     path_to_output_file = path_to_output_directory.join(filename)
diff --git a/test/artefacts/additional-commodity-code/0.html b/test/artefacts/additional-commodity-code/0.html
deleted file mode 100644
index 78d54bc7d5b..00000000000
--- a/test/artefacts/additional-commodity-code/0.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much sucrose, invert sugar or isoglucose does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0 - 4.99
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="5" />
-        5 - 29.99
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="30" />
-        30 - 49.99
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="50" />
-        50 - 69.99
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="70" />
-        70 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/0.txt b/test/artefacts/additional-commodity-code/0.txt
new file mode 100644
index 00000000000..8bd5b55c999
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/0.txt
@@ -0,0 +1,17 @@
+How much sucrose, invert sugar or isoglucose does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0 - 4.99
+  * 5: 5 - 29.99
+  * 30: 30 - 49.99
+  * 50: 50 - 69.99
+  * 70: 70 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/0/0.html b/test/artefacts/additional-commodity-code/0/0.html
deleted file mode 100644
index eaa14462094..00000000000
--- a/test/artefacts/additional-commodity-code/0/0.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/0/0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much milk fat does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0 - 1.49
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="1" />
-        1.5 - 2.99
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="3" />
-        3 - 5.99
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="6" />
-        6 - 8.99
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="9" />
-        9 - 11.99
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="12" />
-        12 - 17.99
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="18" />
-        18 - 25.99
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="radio" name="response" id="response_7" value="26" />
-        26 - 39.99
-      </label>
-    </li>
-    <li>
-      <label for="response_8" class="selectable">
-        <input type="radio" name="response" id="response_8" value="40" />
-        40 - 54.99
-      </label>
-    </li>
-    <li>
-      <label for="response_9" class="selectable">
-        <input type="radio" name="response" id="response_9" value="55" />
-        55 - 69.99
-      </label>
-    </li>
-    <li>
-      <label for="response_10" class="selectable">
-        <input type="radio" name="response" id="response_10" value="70" />
-        70 - 84.99
-      </label>
-    </li>
-    <li>
-      <label for="response_11" class="selectable">
-        <input type="radio" name="response" id="response_11" value="85" />
-        85 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much sucrose, invert sugar or isoglucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much sucrose, invert sugar or isoglucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/0/0.txt b/test/artefacts/additional-commodity-code/0/0.txt
new file mode 100644
index 00000000000..5a2e88d7361
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/0/0.txt
@@ -0,0 +1,24 @@
+How much milk fat does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0 - 1.49
+  * 1: 1.5 - 2.99
+  * 3: 3 - 5.99
+  * 6: 6 - 8.99
+  * 9: 9 - 11.99
+  * 12: 12 - 17.99
+  * 18: 18 - 25.99
+  * 26: 26 - 39.99
+  * 40: 40 - 54.99
+  * 55: 55 - 69.99
+  * 70: 70 - 84.99
+  * 85: 85 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/0/0/0.html b/test/artefacts/additional-commodity-code/0/0/0.html
deleted file mode 100644
index cfdc30f1549..00000000000
--- a/test/artefacts/additional-commodity-code/0/0/0.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/0/0/0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much milk proteins does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0 - 2.49
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="2" />
-        2.5 - 5.99
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="6" />
-        6 - 17.99
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="18" />
-        18 - 29.99
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="30" />
-        30 - 59.99
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="60" />
-        60 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much sucrose, invert sugar or isoglucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much sucrose, invert sugar or isoglucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much milk fat does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 1.49</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0/0?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much milk fat does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/0/0/0.txt b/test/artefacts/additional-commodity-code/0/0/0.txt
new file mode 100644
index 00000000000..9f2daa8bd94
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/0/0/0.txt
@@ -0,0 +1,18 @@
+How much milk proteins does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0 - 2.49
+  * 2: 2.5 - 5.99
+  * 6: 6 - 17.99
+  * 18: 18 - 29.99
+  * 30: 30 - 59.99
+  * 60: 60 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/0/0/18.html b/test/artefacts/additional-commodity-code/0/0/18.html
deleted file mode 100644
index d2b03a039a3..00000000000
--- a/test/artefacts/additional-commodity-code/0/0/18.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/0/0/18" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much milk proteins does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0-5.99
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="6" />
-        6 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much sucrose, invert sugar or isoglucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much sucrose, invert sugar or isoglucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much milk fat does the product contain?</td>
-    <td class="previous-question-body">
-    18 - 25.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0/0?previous_response=18">
-      Change<span class="visuallyhidden"> answer to "How much milk fat does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/0/0/18.txt b/test/artefacts/additional-commodity-code/0/0/18.txt
new file mode 100644
index 00000000000..32fa5d4cef6
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/0/0/18.txt
@@ -0,0 +1,14 @@
+How much milk proteins does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0-5.99
+  * 6: 6 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/0/0/3.html b/test/artefacts/additional-commodity-code/0/0/3.html
deleted file mode 100644
index 19966fa5778..00000000000
--- a/test/artefacts/additional-commodity-code/0/0/3.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/0/0/3" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much milk proteins does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0-2.49
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="2" />
-        2.5-11.99
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="12" />
-        12 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much sucrose, invert sugar or isoglucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much sucrose, invert sugar or isoglucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much milk fat does the product contain?</td>
-    <td class="previous-question-body">
-    3 - 5.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0/0?previous_response=3">
-      Change<span class="visuallyhidden"> answer to "How much milk fat does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/0/0/3.txt b/test/artefacts/additional-commodity-code/0/0/3.txt
new file mode 100644
index 00000000000..5e20400cb52
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/0/0/3.txt
@@ -0,0 +1,15 @@
+How much milk proteins does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0-2.49
+  * 2: 2.5-11.99
+  * 12: 12 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/0/0/6.html b/test/artefacts/additional-commodity-code/0/0/6.html
deleted file mode 100644
index 3bf3351e618..00000000000
--- a/test/artefacts/additional-commodity-code/0/0/6.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/0/0/6" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much milk proteins does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0-3.99
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="4" />
-        4-14.99
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="15" />
-        15 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much sucrose, invert sugar or isoglucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much sucrose, invert sugar or isoglucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much milk fat does the product contain?</td>
-    <td class="previous-question-body">
-    6 - 8.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0/0?previous_response=6">
-      Change<span class="visuallyhidden"> answer to "How much milk fat does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/0/0/6.txt b/test/artefacts/additional-commodity-code/0/0/6.txt
new file mode 100644
index 00000000000..61273bf568f
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/0/0/6.txt
@@ -0,0 +1,15 @@
+How much milk proteins does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0-3.99
+  * 4: 4-14.99
+  * 15: 15 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/0/0/9.html b/test/artefacts/additional-commodity-code/0/0/9.html
deleted file mode 100644
index 9c185f349c9..00000000000
--- a/test/artefacts/additional-commodity-code/0/0/9.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/0/0/9" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much milk proteins does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0-5.99
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="6" />
-        6-17.99
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="18" />
-        18 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much sucrose, invert sugar or isoglucose does the product contain?</td>
-    <td class="previous-question-body">
-    0 - 4.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "How much sucrose, invert sugar or isoglucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much milk fat does the product contain?</td>
-    <td class="previous-question-body">
-    9 - 11.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y/0/0?previous_response=9">
-      Change<span class="visuallyhidden"> answer to "How much milk fat does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/0/0/9.txt b/test/artefacts/additional-commodity-code/0/0/9.txt
new file mode 100644
index 00000000000..fc32de4a515
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/0/0/9.txt
@@ -0,0 +1,15 @@
+How much milk proteins does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0-5.99
+  * 6: 6-17.99
+  * 18: 18 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/25.html b/test/artefacts/additional-commodity-code/25.html
deleted file mode 100644
index ce7aa83f15e..00000000000
--- a/test/artefacts/additional-commodity-code/25.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/25" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much sucrose, invert sugar or isoglucose does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0 - 4.99
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="5" />
-        5 - 29.99
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="30" />
-        30 - 49.99
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="50" />
-        50 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    25 - 49.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/25.txt b/test/artefacts/additional-commodity-code/25.txt
new file mode 100644
index 00000000000..d36660d7a7a
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/25.txt
@@ -0,0 +1,16 @@
+How much sucrose, invert sugar or isoglucose does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0 - 4.99
+  * 5: 5 - 29.99
+  * 30: 30 - 49.99
+  * 50: 50 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/50.html b/test/artefacts/additional-commodity-code/50.html
deleted file mode 100644
index 7cac2b4aa8b..00000000000
--- a/test/artefacts/additional-commodity-code/50.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/50" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much sucrose, invert sugar or isoglucose does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0 - 4.99
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="5" />
-        5 - 29.99
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="30" />
-        30 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    50 - 74.99</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=50">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/50.txt b/test/artefacts/additional-commodity-code/50.txt
new file mode 100644
index 00000000000..3061c417ed6
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/50.txt
@@ -0,0 +1,15 @@
+How much sucrose, invert sugar or isoglucose does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0 - 4.99
+  * 5: 5 - 29.99
+  * 30: 30 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/75.html b/test/artefacts/additional-commodity-code/75.html
deleted file mode 100644
index 141e6774c86..00000000000
--- a/test/artefacts/additional-commodity-code/75.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y/75" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much sucrose, invert sugar or isoglucose does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0 - 4.99
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="5" />
-        5 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/additional-commodity-code">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">How much starch or glucose does the product contain?</td>
-    <td class="previous-question-body">
-    75 or more</td>
-
-  <td class="link-right">
-    <a href="/additional-commodity-code/y?previous_response=75">
-      Change<span class="visuallyhidden"> answer to "How much starch or glucose does the product contain?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/75.txt b/test/artefacts/additional-commodity-code/75.txt
new file mode 100644
index 00000000000..b05439118ce
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/75.txt
@@ -0,0 +1,14 @@
+How much sucrose, invert sugar or isoglucose does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0 - 4.99
+  * 5: 5 or more
+
+
+
+
+
+
diff --git a/test/artefacts/additional-commodity-code/y.html b/test/artefacts/additional-commodity-code/y.html
deleted file mode 100644
index 78a82951006..00000000000
--- a/test/artefacts/additional-commodity-code/y.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Look up Meursing code - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Look up Meursing code
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/additional-commodity-code/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much starch or glucose does the product contain?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The values represent % by weight</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        0 - 4.99
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="5" />
-        5 - 24.99
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="25" />
-        25 - 49.99
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="50" />
-        50 - 74.99
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="75" />
-        75 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/additional-commodity-code/y.txt b/test/artefacts/additional-commodity-code/y.txt
new file mode 100644
index 00000000000..76b823e0325
--- /dev/null
+++ b/test/artefacts/additional-commodity-code/y.txt
@@ -0,0 +1,17 @@
+How much starch or glucose does the product contain?
+
+
+
+The values represent % by weight
+
+  * 0: 0 - 4.99
+  * 5: 5 - 24.99
+  * 25: 25 - 49.99
+  * 50: 50 - 74.99
+  * 75: 75 or more
+
+
+
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment.html b/test/artefacts/am-i-getting-minimum-wage/current_payment.html
deleted file mode 100644
index 0061ede4d84..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you an apprentice?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you’re 19 or over and past your first year you don’t count as an apprentice for minimum wage purposes.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="not_an_apprentice" />
-        Not an apprentice
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="apprentice_under_19" />
-        Apprentice under 19
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="apprentice_over_19_first_year" />
-        Apprentice aged 19 and over in your first year
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="apprentice_over_19_second_year_onwards" />
-        Apprentice 19 and over in your second year or onwards
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment.txt
new file mode 100644
index 00000000000..3371655d99f
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment.txt
@@ -0,0 +1,16 @@
+Are you an apprentice?
+
+
+
+If you’re 19 or over and past your first year you don’t count as an apprentice for minimum wage purposes.
+
+  * not_an_apprentice: Not an apprentice
+  * apprentice_under_19: Apprentice under 19
+  * apprentice_over_19_first_year: Apprentice aged 19 and over in your first year
+  * apprentice_over_19_second_year_onwards: Apprentice 19 and over in your second year or onwards
+
+
+
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.html
deleted file mode 100644
index 5a788b9afbb..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old are you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />years old</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Are you an apprentice?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.txt
new file mode 100644
index 00000000000..c2454cbb753
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice.txt
@@ -0,0 +1,12 @@
+How old are you?
+
+
+
+
+
+
+
+
+years old
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25.html
deleted file mode 100644
index e802e3d8e96..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you get paid?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>This is your pay period.</p>
-
-
-      </article>
-
-      <p class="hint">You get paid every</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />days</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Are you an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old are you?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old are you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25.txt
new file mode 100644
index 00000000000..c3603888ec3
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25.txt
@@ -0,0 +1,13 @@
+How often do you get paid?
+
+This is your pay period.
+
+
+You get paid every
+
+
+
+
+days
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1.html
deleted file mode 100644
index a1a76253818..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours do you work during the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Don’t include any overtime or other extra hours you might work.</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />hours</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Are you an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old are you?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1.txt
new file mode 100644
index 00000000000..e90f58f1bce
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1.txt
@@ -0,0 +1,12 @@
+How many hours do you work during the pay period?
+
+
+
+Don’t include any overtime or other extra hours you might work.
+
+
+
+
+hours
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html
deleted file mode 100644
index 8b0ce89c429..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much does your employer charge for accommodation per day?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per day</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Are you an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old are you?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours do you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you get paid before tax in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime do you work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employer provide you with accommodation?</td>
-    <td class="previous-question-body">
-    Yes, the accommodation is charged for</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0?previous_response=yes_charged">
-      Change<span class="visuallyhidden"> answer to "Does your employer provide you with accommodation?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.txt
new file mode 100644
index 00000000000..f8ad4e86475
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.txt
@@ -0,0 +1,12 @@
+How much does your employer charge for accommodation per day?
+
+
+
+
+
+
+
+
+per day
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html
deleted file mode 100644
index 2ff1760c687..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many days per week do you live in the accommodation?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />days per week</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Are you an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old are you?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours do you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you get paid before tax in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime do you work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employer provide you with accommodation?</td>
-    <td class="previous-question-body">
-    Yes, the accommodation is free</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0?previous_response=yes_free">
-      Change<span class="visuallyhidden"> answer to "Does your employer provide you with accommodation?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.txt
new file mode 100644
index 00000000000..c682ebbb414
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.txt
@@ -0,0 +1,12 @@
+How many days per week do you live in the accommodation?
+
+
+
+
+
+
+
+
+days per week
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html
deleted file mode 100644
index 428a3320f25..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does your employer provide you with accommodation?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="no" />
-        No
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="yes_free" />
-        Yes, the accommodation is free
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="yes_charged" />
-        Yes, the accommodation is charged for
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Are you an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old are you?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours do you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you get paid before tax in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime do you work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.txt
new file mode 100644
index 00000000000..7a2c156ba11
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/0.txt
@@ -0,0 +1,15 @@
+Does your employer provide you with accommodation?
+
+
+
+
+
+  * no: No
+  * yes_free: Yes, the accommodation is free
+  * yes_charged: Yes, the accommodation is charged for
+
+
+
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html
deleted file mode 100644
index 6703f9ecf53..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you get paid for overtime per hour?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per hour</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Are you an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old are you?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours do you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you get paid before tax in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime do you work during the pay period?</td>
-    <td class="previous-question-body">
-    8.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=8.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.txt
new file mode 100644
index 00000000000..25396836b7c
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.0/8.txt
@@ -0,0 +1,12 @@
+How much do you get paid for overtime per hour?
+
+
+
+
+
+
+
+
+per hour
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.html
deleted file mode 100644
index c247ab3aeef..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0/100.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours of overtime do you work during the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you don’t work overtime enter 0</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />hours</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Are you an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old are you?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours do you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you get paid before tax in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you get paid before tax in the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.txt
new file mode 100644
index 00000000000..416746f665b
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.0/100.txt
@@ -0,0 +1,12 @@
+How many hours of overtime do you work during the pay period?
+
+
+
+If you don’t work overtime enter 0
+
+
+
+
+hours
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.html b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.html
deleted file mode 100644
index 7ca1aa3813b..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1/16.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you get paid before tax in the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Don’t include payments for overtime or anything extra to your pay, eg money for clothes or goods.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />in the pay period</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you're getting the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Are you an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old are you?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours do you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours do you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.txt b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.txt
new file mode 100644
index 00000000000..577ef7c6409
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/current_payment/not_an_apprentice/25/1/16.txt
@@ -0,0 +1,12 @@
+How much do you get paid before tax in the pay period?
+
+
+
+Don’t include payments for overtime or anything extra to your pay, eg money for clothes or goods.
+
+
+
+
+in the pay period
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment.html b/test/artefacts/am-i-getting-minimum-wage/past_payment.html
deleted file mode 100644
index 2c73b95de59..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which year would you like to check past payments for?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You can go back up to 6 years</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="2015-10-01" />
-        Oct 2015 - Mar 2016
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="2014-10-01" />
-        Oct 2014 - Sep 2015
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="2013-10-01" />
-        Oct 2013 - Sep 2014
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="2012-10-01" />
-        Oct 2012 - Sep 2013
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="2011-10-01" />
-        Oct 2011 - Sep 2012
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="2010-10-01" />
-        Oct 2010 - Sep 2011
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="2009-10-01" />
-        Oct 2009 - Sep 2010
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment.txt
new file mode 100644
index 00000000000..82186ac8da4
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment.txt
@@ -0,0 +1,19 @@
+Which year would you like to check past payments for?
+
+
+
+You can go back up to 6 years
+
+  * 2015-10-01: Oct 2015 - Mar 2016
+  * 2014-10-01: Oct 2014 - Sep 2015
+  * 2013-10-01: Oct 2013 - Sep 2014
+  * 2012-10-01: Oct 2012 - Sep 2013
+  * 2011-10-01: Oct 2011 - Sep 2012
+  * 2010-10-01: Oct 2010 - Sep 2011
+  * 2009-10-01: Oct 2009 - Sep 2010
+
+
+
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01.html
deleted file mode 100644
index 2becd1d1bdb..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Were you an apprentice at the time?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="no" />
-        No
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="apprentice_under_19" />
-        Apprentice under 19
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="apprentice_over_19" />
-        Apprentice aged 19 and over and in your first year
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01.txt
new file mode 100644
index 00000000000..dd9e8d1e1ff
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01.txt
@@ -0,0 +1,15 @@
+Were you an apprentice at the time?
+
+
+
+
+
+  * no: No
+  * apprentice_under_19: Apprentice under 19
+  * apprentice_over_19: Apprentice aged 19 and over and in your first year
+
+
+
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no.html
deleted file mode 100644
index 3888ca294c5..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old were you at the time?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />years old</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no.txt
new file mode 100644
index 00000000000..735e63b82c8
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no.txt
@@ -0,0 +1,12 @@
+How old were you at the time?
+
+
+
+
+
+
+
+
+years old
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25.html
deleted file mode 100644
index 70bc06840df..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often did you get paid?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>This is your pay period.</p>
-
-
-      </article>
-
-      <p class="hint">You get paid every</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />days</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old were you at the time?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25.txt
new file mode 100644
index 00000000000..48a87b33fb8
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25.txt
@@ -0,0 +1,13 @@
+How often did you get paid?
+
+This is your pay period.
+
+
+You get paid every
+
+
+
+
+days
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1.html
deleted file mode 100644
index b08bc957a20..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours did you work during the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Don’t include any overtime or other extra hours you worked.</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />hours</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old were you at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you get paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1.txt
new file mode 100644
index 00000000000..913826c558c
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1.txt
@@ -0,0 +1,12 @@
+How many hours did you work during the pay period?
+
+
+
+Don’t include any overtime or other extra hours you worked.
+
+
+
+
+hours
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
deleted file mode 100644
index 7c6f1ff8c98..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much did your employer charge for accommodation per day?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per day</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old were you at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much were you paid in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much were you paid in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime did you work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employer provide you with accommodation?</td>
-    <td class="previous-question-body">
-    Yes, the accommodation was charged for</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0?previous_response=yes_charged">
-      Change<span class="visuallyhidden"> answer to "Did your employer provide you with accommodation?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.txt
new file mode 100644
index 00000000000..b0bc17a683b
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.txt
@@ -0,0 +1,12 @@
+How much did your employer charge for accommodation per day?
+
+
+
+
+
+
+
+
+per day
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
deleted file mode 100644
index 5736e31ed4e..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many days per week did you live in the accommodation?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />days per week</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old were you at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much were you paid in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much were you paid in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime did you work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employer provide you with accommodation?</td>
-    <td class="previous-question-body">
-    Yes, the accommodation was free</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0?previous_response=yes_free">
-      Change<span class="visuallyhidden"> answer to "Did your employer provide you with accommodation?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.txt
new file mode 100644
index 00000000000..6048707f53e
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.txt
@@ -0,0 +1,12 @@
+How many days per week did you live in the accommodation?
+
+
+
+
+
+
+
+
+days per week
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.html
deleted file mode 100644
index 43308464b62..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did your employer provide you with accommodation?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="no" />
-        No
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="yes_free" />
-        Yes, the accommodation was free
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="yes_charged" />
-        Yes, the accommodation was charged for
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old were you at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much were you paid in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much were you paid in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime did you work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.txt
new file mode 100644
index 00000000000..4c4fafd7e48
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/0.txt
@@ -0,0 +1,15 @@
+Did your employer provide you with accommodation?
+
+
+
+
+
+  * no: No
+  * yes_free: Yes, the accommodation was free
+  * yes_charged: Yes, the accommodation was charged for
+
+
+
+
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/8.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/8.html
deleted file mode 100644
index fbc6ddb1cd2..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/8.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0/8.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much did you get paid for overtime per hour?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per hour</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old were you at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much were you paid in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much were you paid in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime did you work during the pay period?</td>
-    <td class="previous-question-body">
-    8.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0?previous_response=8.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/8.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/8.txt
new file mode 100644
index 00000000000..8fd1c895469
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.0/8.txt
@@ -0,0 +1,12 @@
+How much did you get paid for overtime per hour?
+
+
+
+
+
+
+
+
+per hour
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.html
deleted file mode 100644
index f15a95c64df..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0/100.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours of overtime did you work during the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you didn’t work overtime enter 0</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />hours</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old were you at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much were you paid in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much were you paid in the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.txt
new file mode 100644
index 00000000000..3795773c941
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.0/100.txt
@@ -0,0 +1,12 @@
+How many hours of overtime did you work during the pay period?
+
+
+
+If you didn’t work overtime enter 0
+
+
+
+
+hours
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.html b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.html
deleted file mode 100644
index e0facaf666d..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1/16.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much were you paid in the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Don’t include payments for overtime or anything extra to your pay, eg money for clothes or goods.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />in the pay period</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/am-i-getting-minimum-wage">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If an employer owes you past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old were you at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you get paid?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you get paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did you work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/am-i-getting-minimum-wage/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did you work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.txt b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.txt
new file mode 100644
index 00000000000..201cc8b1102
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/past_payment/2015-10-01/no/25/1/16.txt
@@ -0,0 +1,12 @@
+How much were you paid in the pay period?
+
+
+
+Don’t include payments for overtime or anything extra to your pay, eg money for clothes or goods.
+
+
+
+
+in the pay period
+
+
diff --git a/test/artefacts/am-i-getting-minimum-wage/y.html b/test/artefacts/am-i-getting-minimum-wage/y.html
deleted file mode 100644
index 3378b8895e1..00000000000
--- a/test/artefacts/am-i-getting-minimum-wage/y.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for workers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for workers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/am-i-getting-minimum-wage/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What would you like to check?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="current_payment" />
-        If you're getting the National Minimum Wage or the National Living Wage
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="past_payment" />
-        If an employer owes you past payments (before April 2016)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/am-i-getting-minimum-wage/y.txt b/test/artefacts/am-i-getting-minimum-wage/y.txt
new file mode 100644
index 00000000000..410397360f6
--- /dev/null
+++ b/test/artefacts/am-i-getting-minimum-wage/y.txt
@@ -0,0 +1,14 @@
+What would you like to check?
+
+
+
+
+
+  * current_payment: If you're getting the National Minimum Wage or the National Living Wage
+  * past_payment: If an employer owes you past payments (before April 2016)
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default.html b/test/artefacts/benefit-cap-calculator/default.html
deleted file mode 100644
index d9a5461b031..00000000000
--- a/test/artefacts/benefit-cap-calculator/default.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you receive Housing Benefit?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default.txt b/test/artefacts/benefit-cap-calculator/default.txt
new file mode 100644
index 00000000000..ec9138419f3
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default.txt
@@ -0,0 +1,14 @@
+Do you receive Housing Benefit?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes.html b/test/artefacts/benefit-cap-calculator/default/yes.html
deleted file mode 100644
index b7a8feed069..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you qualify for Working Tax Credit?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You don't need to be getting Working Tax Credit, only qualify for it.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes.txt b/test/artefacts/benefit-cap-calculator/default/yes.txt
new file mode 100644
index 00000000000..c1a05895947
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes.txt
@@ -0,0 +1,14 @@
+Do you qualify for Working Tax Credit?
+
+
+
+You don't need to be getting Working Tax Credit, only qualify for it.
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no.html b/test/artefacts/benefit-cap-calculator/default/yes/no.html
deleted file mode 100644
index cde186c2bc7..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you or someone in your household get any of the following benefits?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>Attendance Allowance</li>
-  <li>Disability Living Allowance</li>
-  <li>Industrial Injuries Benefit</li>
-  <li>Personal Independence Payment</li>
-  <li>Employment and Support Allowance (support component)</li>
-  <li>War Widow’s or War Widower’s Pension</li>
-  <li>Armed Forces Compensation Scheme</li>
-  <li>Armed Forces Independence Payment</li>
-</ul>
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no.txt b/test/artefacts/benefit-cap-calculator/default/yes/no.txt
new file mode 100644
index 00000000000..0c7354c784a
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no.txt
@@ -0,0 +1,22 @@
+Do you or someone in your household get any of the following benefits?
+
+- Attendance Allowance
+- Disability Living Allowance
+- Industrial Injuries Benefit
+- Personal Independence Payment
+- Employment and Support Allowance (support component)
+- War Widow’s or War Widower’s Pension
+- Armed Forces Compensation Scheme
+- Armed Forces Independence Payment
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no.html
deleted file mode 100644
index 3fc8058e14d..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you or someone in your household get any of the following benefits?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you do not receive any of these click 'Next step'.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="bereavement" />
-        Bereavement Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="carers" />
-        Carer's Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="child_benefit" />
-        Child Benefit
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="child_tax" />
-        Child Tax Credit
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="esa" />
-        Employment and Support Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="guardian" />
-        Guardian's Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="checkbox" name="response[]" id="response_6" value="incapacity" />
-        Incapacity Benefit
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="checkbox" name="response[]" id="response_7" value="income_support" />
-        Income Support
-      </label>
-    </li>
-    <li>
-      <label for="response_8" class="selectable">
-        <input type="checkbox" name="response[]" id="response_8" value="jsa" />
-        Jobseeker’s Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_9" class="selectable">
-        <input type="checkbox" name="response[]" id="response_9" value="maternity" />
-        Maternity Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_10" class="selectable">
-        <input type="checkbox" name="response[]" id="response_10" value="sda" />
-        Severe Disablement Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_11" class="selectable">
-        <input type="checkbox" name="response[]" id="response_11" value="widowed_mother" />
-        Widowed Mother's Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_12" class="selectable">
-        <input type="checkbox" name="response[]" id="response_12" value="widowed_parent" />
-        Widowed Parent's Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_13" class="selectable">
-        <input type="checkbox" name="response[]" id="response_13" value="widow_pension" />
-        Widow's Pension
-      </label>
-    </li>
-    <li>
-      <label for="response_14" class="selectable">
-        <input type="checkbox" name="response[]" id="response_14" value="widows_aged" />
-        Widow's Pension (age related)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no.txt
new file mode 100644
index 00000000000..2d6c2ac76f3
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no.txt
@@ -0,0 +1,27 @@
+Do you or someone in your household get any of the following benefits?
+
+
+
+If you do not receive any of these click 'Next step'.
+
+  * bereavement: Bereavement Allowance
+  * carers: Carer's Allowance
+  * child_benefit: Child Benefit
+  * child_tax: Child Tax Credit
+  * esa: Employment and Support Allowance
+  * guardian: Guardian's Allowance
+  * incapacity: Incapacity Benefit
+  * income_support: Income Support
+  * jsa: Jobseeker’s Allowance
+  * maternity: Maternity Allowance
+  * sda: Severe Disablement Allowance
+  * widowed_mother: Widowed Mother's Allowance
+  * widowed_parent: Widowed Parent's Allowance
+  * widow_pension: Widow's Pension
+  * widows_aged: Widow's Pension (age related)
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index faaf45e7887..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,316 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Widow's Pension (age related)?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Guardian's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Guardian's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Incapacity Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Incapacity Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Income Support?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Income Support?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Jobseeker’s Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Jobseeker’s Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Maternity Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Maternity Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Severe Disability Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Severe Disability Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Widow's Pension?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Widow's Pension?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Widowed Mother's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Widowed Mother's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Widowed Parent's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Widowed Parent's Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..a30a2ca4d03
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Widow's Pension (age related)?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index c0500b22f76..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,305 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Widowed Parent's Allowance?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Guardian's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Guardian's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Incapacity Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Incapacity Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Income Support?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Income Support?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Jobseeker’s Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Jobseeker’s Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Maternity Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Maternity Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Severe Disability Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Severe Disability Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Widow's Pension?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Widow's Pension?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Widowed Mother's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Widowed Mother's Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..0752e25f43a
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Widowed Parent's Allowance?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index 8d858d8c026..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,294 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Widowed Mother's Allowance?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Guardian's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Guardian's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Incapacity Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Incapacity Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Income Support?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Income Support?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Jobseeker’s Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Jobseeker’s Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Maternity Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Maternity Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Severe Disability Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Severe Disability Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Widow's Pension?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Widow's Pension?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..73997142e05
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Widowed Mother's Allowance?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index 69850567ab1..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,283 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Widow's Pension?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Guardian's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Guardian's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Incapacity Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Incapacity Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Income Support?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Income Support?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Jobseeker’s Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Jobseeker’s Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Maternity Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Maternity Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Severe Disability Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Severe Disability Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..0ff66302f87
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Widow's Pension?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index 8d240e99446..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,272 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Severe Disability Allowance?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Guardian's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Guardian's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Incapacity Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Incapacity Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Income Support?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Income Support?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Jobseeker’s Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Jobseeker’s Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Maternity Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Maternity Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..90523ad2d57
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Severe Disability Allowance?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index 6ccee5ff9d0..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Maternity Allowance?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Guardian's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Guardian's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Incapacity Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Incapacity Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Income Support?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Income Support?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Jobseeker’s Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Jobseeker’s Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..f06512df280
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Maternity Allowance?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index 1ac5f9fb65c..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Jobseeker’s Allowance?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Guardian's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Guardian's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Incapacity Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Incapacity Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Income Support?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Income Support?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..d45c763df48
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Jobseeker’s Allowance?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index 7195b83eec0..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Income Support?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Guardian's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Guardian's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Incapacity Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Incapacity Benefit?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..610afd55dac
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Income Support?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index 07ea90757ea..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Incapacity Benefit?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Guardian's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Guardian's Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..35f144f3a7c
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Incapacity Benefit?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.html
deleted file mode 100644
index ee24a7f1d87..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Guardian's Allowance?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Employment and Support Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Employment and Support Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..ab3762a48ac
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Guardian's Allowance?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.html
deleted file mode 100644
index e84563cb966..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Employment and Support Allowance?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Tax Credit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.txt
new file mode 100644
index 00000000000..e561b274585
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Employment and Support Allowance?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.html
deleted file mode 100644
index 9a8547ab94a..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Child Tax Credit?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Child Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Child Benefit?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.txt
new file mode 100644
index 00000000000..3e915958cb1
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Child Tax Credit?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.html
deleted file mode 100644
index dbdae2cf0a6..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Child Benefit?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Carer's Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Carer's Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.txt
new file mode 100644
index 00000000000..6f9801a73b5
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Child Benefit?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.html
deleted file mode 100644
index b6985e7215b..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Carer's Allowance?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-      <li>Carer's Allowance</li>
-      <li>Child Benefit</li>
-      <li>Child Tax Credit</li>
-      <li>Employment and Support Allowance</li>
-      <li>Guardian's Allowance</li>
-      <li>Incapacity Benefit</li>
-      <li>Income Support</li>
-      <li>Jobseeker’s Allowance</li>
-      <li>Maternity Allowance</li>
-      <li>Severe Disablement Allowance</li>
-      <li>Widow's Pension</li>
-      <li>Widowed Mother's Allowance</li>
-      <li>Widowed Parent's Allowance</li>
-      <li>Widow's Pension (age related)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement%2Ccarers%2Cchild_benefit%2Cchild_tax%2Cesa%2Cguardian%2Cincapacity%2Cincome_support%2Cjsa%2Cmaternity%2Csda%2Cwidow_pension%2Cwidowed_mother%2Cwidowed_parent%2Cwidows_aged">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Bereavement Allowance?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Bereavement Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.txt
new file mode 100644
index 00000000000..f7c1e461ecc
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement,carers,child_benefit,child_tax,esa,guardian,incapacity,income_support,jsa,maternity,sda,widow_pension,widowed_mother,widowed_parent,widows_aged/50.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Carer's Allowance?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement.html
deleted file mode 100644
index 06ee0582df1..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/bereavement" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Bereavement Allowance?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>Bereavement Allowance</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=bereavement">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement.txt
new file mode 100644
index 00000000000..8e31ce49586
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/bereavement.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Bereavement Allowance?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/none.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/none.html
deleted file mode 100644
index b5e2d801798..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/none.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/none" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you or someone in your household get for Housing Benefit?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/none.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/none.txt
new file mode 100644
index 00000000000..79e6a0ce3cf
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/none.txt
@@ -0,0 +1,12 @@
+How much do you or someone in your household get for Housing Benefit?
+
+
+
+You need the whole amount before anything is taken off (eg utility bills or loan repayments) per week. You must enter the full amount you get for each benefit.
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/none/50.html b/test/artefacts/benefit-cap-calculator/default/yes/no/no/none/50.html
deleted file mode 100644
index 5dfae2c43bd..00000000000
--- a/test/artefacts/benefit-cap-calculator/default/yes/no/no/none/50.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/default/yes/no/no/none/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="single" />
-        Single
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="couple" />
-        Living as a couple (with or without children)
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="parent" />
-        A lone parent with one or more dependent children
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Now</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=default">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Housing Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/default/yes/no/no/none?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/default/yes/no/no/none/50.txt b/test/artefacts/benefit-cap-calculator/default/yes/no/no/none/50.txt
new file mode 100644
index 00000000000..461d887a438
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/default/yes/no/no/none/50.txt
@@ -0,0 +1,15 @@
+Are you:
+
+
+
+
+
+  * single: Single
+  * couple: Living as a couple (with or without children)
+  * parent: A lone parent with one or more dependent children
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/future/yes/no/no.html b/test/artefacts/benefit-cap-calculator/future/yes/no/no.html
deleted file mode 100644
index 5825c13b1f4..00000000000
--- a/test/artefacts/benefit-cap-calculator/future/yes/no/no.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/future/yes/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you or someone in your household get any of the following benefits?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you do not receive any of these click 'Next step'.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="bereavement" />
-        Bereavement Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="child_benefit" />
-        Child Benefit
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="child_tax" />
-        Child Tax Credit
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="esa" />
-        Employment and Support Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="incapacity" />
-        Incapacity Benefit
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="income_support" />
-        Income Support
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="checkbox" name="response[]" id="response_6" value="jsa" />
-        Jobseeker’s Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="checkbox" name="response[]" id="response_7" value="maternity" />
-        Maternity Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_8" class="selectable">
-        <input type="checkbox" name="response[]" id="response_8" value="sda" />
-        Severe Disablement Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_9" class="selectable">
-        <input type="checkbox" name="response[]" id="response_9" value="widowed_mother" />
-        Widowed Mother's Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_10" class="selectable">
-        <input type="checkbox" name="response[]" id="response_10" value="widowed_parent" />
-        Widowed Parent's Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_11" class="selectable">
-        <input type="checkbox" name="response[]" id="response_11" value="widow_pension" />
-        Widow's Pension
-      </label>
-    </li>
-    <li>
-      <label for="response_12" class="selectable">
-        <input type="checkbox" name="response[]" id="response_12" value="widows_aged" />
-        Widow's Pension (age related)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Autumn 2016</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=future">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/future/yes/no/no.txt b/test/artefacts/benefit-cap-calculator/future/yes/no/no.txt
new file mode 100644
index 00000000000..008d692ba05
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/future/yes/no/no.txt
@@ -0,0 +1,25 @@
+Do you or someone in your household get any of the following benefits?
+
+
+
+If you do not receive any of these click 'Next step'.
+
+  * bereavement: Bereavement Allowance
+  * child_benefit: Child Benefit
+  * child_tax: Child Tax Credit
+  * esa: Employment and Support Allowance
+  * incapacity: Incapacity Benefit
+  * income_support: Income Support
+  * jsa: Jobseeker’s Allowance
+  * maternity: Maternity Allowance
+  * sda: Severe Disablement Allowance
+  * widowed_mother: Widowed Mother's Allowance
+  * widowed_parent: Widowed Parent's Allowance
+  * widow_pension: Widow's Pension
+  * widows_aged: Widow's Pension (age related)
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.0/single.html b/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.0/single.html
deleted file mode 100644
index 55f9ba463c1..00000000000
--- a/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.0/single.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/future/yes/no/no/none/50.0/single" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Enter your postcode
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>eg SW1A 2AA</p>
-
-      </article>
-
-
-    <div class="">
-
-      <label for="response">
-  <input type="text" name="response" id="response" />
-</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Autumn 2016</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=future">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes/no/no?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Housing Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes/no/no/none?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you:</td>
-    <td class="previous-question-body">
-    Single</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes/no/no/none/50.0?previous_response=single">
-      Change<span class="visuallyhidden"> answer to "Are you:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.0/single.txt b/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.0/single.txt
new file mode 100644
index 00000000000..74453305871
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.0/single.txt
@@ -0,0 +1,13 @@
+Enter your postcode
+
+eg SW1A 2AA
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.html b/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.html
deleted file mode 100644
index e077a828dee..00000000000
--- a/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y/future/yes/no/no/none/50.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="single" />
-        Single
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="couple" />
-        Living as a couple (with or without children)
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="parent" />
-        A lone parent with one or more dependent children
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/benefit-cap-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which period do you want to check for?</td>
-    <td class="previous-question-body">
-    Autumn 2016</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y?previous_response=future">
-      Change<span class="visuallyhidden"> answer to "Which period do you want to check for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you receive Housing Benefit?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you receive Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you qualify for Working Tax Credit?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you qualify for Working Tax Credit?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you or someone in your household get any of the following benefits?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes/no/no?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "Do you or someone in your household get any of the following benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you or someone in your household get for Housing Benefit?</td>
-    <td class="previous-question-body">
-    £50</td>
-
-  <td class="link-right">
-    <a href="/benefit-cap-calculator/y/future/yes/no/no/none?previous_response=50.0">
-      Change<span class="visuallyhidden"> answer to "How much do you or someone in your household get for Housing Benefit?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.txt b/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.txt
new file mode 100644
index 00000000000..461d887a438
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/future/yes/no/no/none/50.txt
@@ -0,0 +1,15 @@
+Are you:
+
+
+
+
+
+  * single: Single
+  * couple: Living as a couple (with or without children)
+  * parent: A lone parent with one or more dependent children
+
+
+
+
+
+
diff --git a/test/artefacts/benefit-cap-calculator/y.html b/test/artefacts/benefit-cap-calculator/y.html
deleted file mode 100644
index b9f62147fb4..00000000000
--- a/test/artefacts/benefit-cap-calculator/y.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Benefit cap calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Benefit cap calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/benefit-cap-calculator/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which period do you want to check for?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>The benefit cap will change in autumn 2016.</p>
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="default" />
-        Now
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="future" />
-        Autumn 2016
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/benefit-cap-calculator/y.txt b/test/artefacts/benefit-cap-calculator/y.txt
new file mode 100644
index 00000000000..f9c4ae21b3c
--- /dev/null
+++ b/test/artefacts/benefit-cap-calculator/y.txt
@@ -0,0 +1,15 @@
+Which period do you want to check for?
+
+The benefit cap will change in autumn 2016.
+
+
+
+
+  * default: Now
+  * future: Autumn 2016
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days.html b/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days.html
deleted file mode 100644
index afef7da09ff..00000000000
--- a/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your agricultural worker holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your agricultural worker holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-agricultural-holiday-entitlement/y/different-number-of-days" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What date will your holiday start?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This is the first day that you will take off work as leave</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-agricultural-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Do you work the same number of days each week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-agricultural-holiday-entitlement/y?previous_response=different-number-of-days">
-      Change<span class="visuallyhidden"> answer to "Do you work the same number of days each week?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days.txt b/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days.txt
new file mode 100644
index 00000000000..6b3ad6d101e
--- /dev/null
+++ b/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days.txt
@@ -0,0 +1,12 @@
+What date will your holiday start?
+
+
+
+This is the first day that you will take off work as leave
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days/2015-02-01.html b/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days/2015-02-01.html
deleted file mode 100644
index 7c480169200..00000000000
--- a/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days/2015-02-01.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your agricultural worker holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your agricultural worker holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-agricultural-holiday-entitlement/y/different-number-of-days/2015-02-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many days will you have worked between 1 October (the start of the leave year) and the start of your holiday?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This includes any days that you worked basic hours, took annual leave or were off sick (whether paid or not).</p>
-
-    <div class="">
-
-      <label for="response">Total days worked for current employer<input type="text" name="response" id="response" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-agricultural-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Do you work the same number of days each week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-agricultural-holiday-entitlement/y?previous_response=different-number-of-days">
-      Change<span class="visuallyhidden"> answer to "Do you work the same number of days each week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What date will your holiday start?</td>
-    <td class="previous-question-body">
-     1 February 2015</td>
-
-  <td class="link-right">
-    <a href="/calculate-agricultural-holiday-entitlement/y/different-number-of-days?previous_response=2015-02-01">
-      Change<span class="visuallyhidden"> answer to "What date will your holiday start?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days/2015-02-01.txt b/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days/2015-02-01.txt
new file mode 100644
index 00000000000..df07ffd31b7
--- /dev/null
+++ b/test/artefacts/calculate-agricultural-holiday-entitlement/different-number-of-days/2015-02-01.txt
@@ -0,0 +1,12 @@
+How many days will you have worked between 1 October (the start of the leave year) and the start of your holiday?
+
+
+
+This includes any days that you worked basic hours, took annual leave or were off sick (whether paid or not).
+
+
+Total days worked for current employer
+
+
+
+
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days.html b/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days.html
deleted file mode 100644
index bead84127c3..00000000000
--- a/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your agricultural worker holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your agricultural worker holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-agricultural-holiday-entitlement/y/same-number-of-days" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many days do you work per week?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>Include guaranteed overtime hours if:</p>
-
-<ul>
-  <li>you have to work them as part of your contract</li>
-  <li>you&rsquo;re paid for the time even if there’s no work for you to do</li>
-</ul>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="7-days" />
-        7 days per week
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="6-days" />
-        6 days per week
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="5-days" />
-        5 days per week
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="4-days" />
-        4 days per week
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="3-days" />
-        3 days per week
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="2-days" />
-        2 days per week
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="1-day" />
-        1 day per week
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-agricultural-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Do you work the same number of days each week?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-agricultural-holiday-entitlement/y?previous_response=same-number-of-days">
-      Change<span class="visuallyhidden"> answer to "Do you work the same number of days each week?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days.txt b/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days.txt
new file mode 100644
index 00000000000..b73ef2eb4ae
--- /dev/null
+++ b/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days.txt
@@ -0,0 +1,23 @@
+How many days do you work per week?
+
+Include guaranteed overtime hours if:
+
+- you have to work them as part of your contract
+- you're paid for the time even if there’s no work for you to do
+
+
+
+
+  * 7-days: 7 days per week
+  * 6-days: 6 days per week
+  * 5-days: 5 days per week
+  * 4-days: 4 days per week
+  * 3-days: 3 days per week
+  * 2-days: 2 days per week
+  * 1-day: 1 day per week
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days.html b/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days.html
deleted file mode 100644
index 915e5d51fc7..00000000000
--- a/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your agricultural worker holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your agricultural worker holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-agricultural-holiday-entitlement/y/same-number-of-days/7-days" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Have you worked for the same employer for a full year?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="same-employer" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="multiple-employers" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-agricultural-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Do you work the same number of days each week?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-agricultural-holiday-entitlement/y?previous_response=same-number-of-days">
-      Change<span class="visuallyhidden"> answer to "Do you work the same number of days each week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many days do you work per week?</td>
-    <td class="previous-question-body">
-    7 days per week</td>
-
-  <td class="link-right">
-    <a href="/calculate-agricultural-holiday-entitlement/y/same-number-of-days?previous_response=7-days">
-      Change<span class="visuallyhidden"> answer to "How many days do you work per week?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days.txt b/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days.txt
new file mode 100644
index 00000000000..c5c6ca447df
--- /dev/null
+++ b/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days.txt
@@ -0,0 +1,14 @@
+Have you worked for the same employer for a full year?
+
+
+
+
+
+  * same-employer: Yes
+  * multiple-employers: No
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days/multiple-employers.html b/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days/multiple-employers.html
deleted file mode 100644
index ac48151fba2..00000000000
--- a/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days/multiple-employers.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your agricultural worker holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your agricultural worker holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-agricultural-holiday-entitlement/y/same-number-of-days/7-days/multiple-employers" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many weeks have you worked continuously for your current employer?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">Weeks worked at current employer<input type="text" name="response" id="response" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-agricultural-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Do you work the same number of days each week?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-agricultural-holiday-entitlement/y?previous_response=same-number-of-days">
-      Change<span class="visuallyhidden"> answer to "Do you work the same number of days each week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many days do you work per week?</td>
-    <td class="previous-question-body">
-    7 days per week</td>
-
-  <td class="link-right">
-    <a href="/calculate-agricultural-holiday-entitlement/y/same-number-of-days?previous_response=7-days">
-      Change<span class="visuallyhidden"> answer to "How many days do you work per week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have you worked for the same employer for a full year?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-agricultural-holiday-entitlement/y/same-number-of-days/7-days?previous_response=multiple-employers">
-      Change<span class="visuallyhidden"> answer to "Have you worked for the same employer for a full year?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days/multiple-employers.txt b/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days/multiple-employers.txt
new file mode 100644
index 00000000000..2bb844c7acb
--- /dev/null
+++ b/test/artefacts/calculate-agricultural-holiday-entitlement/same-number-of-days/7-days/multiple-employers.txt
@@ -0,0 +1,12 @@
+How many weeks have you worked continuously for your current employer?
+
+
+
+
+
+
+Weeks worked at current employer
+
+
+
+
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/y.html b/test/artefacts/calculate-agricultural-holiday-entitlement/y.html
deleted file mode 100644
index 9e998a14d9f..00000000000
--- a/test/artefacts/calculate-agricultural-holiday-entitlement/y.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your agricultural worker holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your agricultural worker holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-agricultural-holiday-entitlement/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you work the same number of days each week?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="same-number-of-days" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="different-number-of-days" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-agricultural-holiday-entitlement/y.txt b/test/artefacts/calculate-agricultural-holiday-entitlement/y.txt
new file mode 100644
index 00000000000..5aadd0b1524
--- /dev/null
+++ b/test/artefacts/calculate-agricultural-holiday-entitlement/y.txt
@@ -0,0 +1,14 @@
+Do you work the same number of days each week?
+
+
+
+
+
+  * same-number-of-days: Yes
+  * different-number-of-days: No
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-employee-redundancy-pay/2012-01-01.html b/test/artefacts/calculate-employee-redundancy-pay/2012-01-01.html
deleted file mode 100644
index bda0ea1dec1..00000000000
--- a/test/artefacts/calculate-employee-redundancy-pay/2012-01-01.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory redundancy pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory redundancy pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-employee-redundancy-pay/y/2012-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old was your employee on the date they were made redundant?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />years old</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-employee-redundancy-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What date was your employee made redundant?</td>
-    <td class="previous-question-body">
-     1 January 2012</td>
-
-  <td class="link-right">
-    <a href="/calculate-employee-redundancy-pay/y?previous_response=2012-01-01">
-      Change<span class="visuallyhidden"> answer to "What date was your employee made redundant?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-employee-redundancy-pay/2012-01-01.txt b/test/artefacts/calculate-employee-redundancy-pay/2012-01-01.txt
new file mode 100644
index 00000000000..1f6e8889fbf
--- /dev/null
+++ b/test/artefacts/calculate-employee-redundancy-pay/2012-01-01.txt
@@ -0,0 +1,12 @@
+How old was your employee on the date they were made redundant?
+
+
+
+
+
+
+
+
+years old
+
+
diff --git a/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21.html b/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21.html
deleted file mode 100644
index a4d06356029..00000000000
--- a/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory redundancy pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory redundancy pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-employee-redundancy-pay/y/2012-01-01/21" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Number of years they’ve worked for you
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Only count full years of service. For example, 3 years and 9 months count as 3 years.</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />full years worked</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-employee-redundancy-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What date was your employee made redundant?</td>
-    <td class="previous-question-body">
-     1 January 2012</td>
-
-  <td class="link-right">
-    <a href="/calculate-employee-redundancy-pay/y?previous_response=2012-01-01">
-      Change<span class="visuallyhidden"> answer to "What date was your employee made redundant?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was your employee on the date they were made redundant?</td>
-    <td class="previous-question-body">
-    21</td>
-
-  <td class="link-right">
-    <a href="/calculate-employee-redundancy-pay/y/2012-01-01?previous_response=21">
-      Change<span class="visuallyhidden"> answer to "How old was your employee on the date they were made redundant?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21.txt b/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21.txt
new file mode 100644
index 00000000000..d8a2ff63d5b
--- /dev/null
+++ b/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21.txt
@@ -0,0 +1,12 @@
+Number of years they’ve worked for you
+
+
+
+Only count full years of service. For example, 3 years and 9 months count as 3 years.
+
+
+
+
+full years worked
+
+
diff --git a/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21/3.html b/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21/3.html
deleted file mode 100644
index cbe0bd23d4a..00000000000
--- a/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21/3.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory redundancy pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory redundancy pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-employee-redundancy-pay/y/2012-01-01/21/3.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is their weekly pay before tax and any other deductions?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Examples of other deductions include student loans and child maintenance.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per week</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-employee-redundancy-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What date was your employee made redundant?</td>
-    <td class="previous-question-body">
-     1 January 2012</td>
-
-  <td class="link-right">
-    <a href="/calculate-employee-redundancy-pay/y?previous_response=2012-01-01">
-      Change<span class="visuallyhidden"> answer to "What date was your employee made redundant?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was your employee on the date they were made redundant?</td>
-    <td class="previous-question-body">
-    21</td>
-
-  <td class="link-right">
-    <a href="/calculate-employee-redundancy-pay/y/2012-01-01?previous_response=21">
-      Change<span class="visuallyhidden"> answer to "How old was your employee on the date they were made redundant?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Number of years they’ve worked for you</td>
-    <td class="previous-question-body">
-    3.0</td>
-
-  <td class="link-right">
-    <a href="/calculate-employee-redundancy-pay/y/2012-01-01/21?previous_response=3.0">
-      Change<span class="visuallyhidden"> answer to "Number of years they’ve worked for you"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21/3.txt b/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21/3.txt
new file mode 100644
index 00000000000..ce3973a3c1a
--- /dev/null
+++ b/test/artefacts/calculate-employee-redundancy-pay/2012-01-01/21/3.txt
@@ -0,0 +1,12 @@
+What is their weekly pay before tax and any other deductions?
+
+
+
+Examples of other deductions include student loans and child maintenance.
+
+
+
+
+per week
+
+
diff --git a/test/artefacts/calculate-employee-redundancy-pay/y.html b/test/artefacts/calculate-employee-redundancy-pay/y.html
deleted file mode 100644
index 7c964b9ce7c..00000000000
--- a/test/artefacts/calculate-employee-redundancy-pay/y.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory redundancy pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory redundancy pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-employee-redundancy-pay/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What date was your employee made redundant?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Use the original redundancy date even if their notice is brought forward, they’re paid in lieu of notice or made redundant after trialing a new job.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-employee-redundancy-pay/y.txt b/test/artefacts/calculate-employee-redundancy-pay/y.txt
new file mode 100644
index 00000000000..f8b1c57dd38
--- /dev/null
+++ b/test/artefacts/calculate-employee-redundancy-pay/y.txt
@@ -0,0 +1,12 @@
+What date was your employee made redundant?
+
+
+
+Use the original redundancy date even if their notice is brought forward, they’re paid in lieu of notice or made redundant after trialing a new job.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/y.html b/test/artefacts/calculate-married-couples-allowance/y.html
deleted file mode 100644
index f8cb6628d1c..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/y.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Were you or your partner born before 6 April 1935?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You must be married or in a civil partnership to qualify.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/y.txt b/test/artefacts/calculate-married-couples-allowance/y.txt
new file mode 100644
index 00000000000..f756809104b
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/y.txt
@@ -0,0 +1,14 @@
+Were you or your partner born before 6 April 1935?
+
+
+
+You must be married or in a civil partnership to qualify.
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/yes.html b/test/artefacts/calculate-married-couples-allowance/yes.html
deleted file mode 100644
index 793a1b458b7..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/yes.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did you marry before 5 December 2005?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Before this date the husband's income is used to work out your allowance, after this date it's the income of the highest earner.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-married-couples-allowance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Were you or your partner born before 6 April 1935?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you or your partner born before 6 April 1935?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/yes.txt b/test/artefacts/calculate-married-couples-allowance/yes.txt
new file mode 100644
index 00000000000..aa855a0f2b1
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/yes.txt
@@ -0,0 +1,14 @@
+Did you marry before 5 December 2005?
+
+
+
+Before this date the husband's income is used to work out your allowance, after this date it's the income of the highest earner.
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/no.html b/test/artefacts/calculate-married-couples-allowance/yes/no.html
deleted file mode 100644
index c4eccafbfa5..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/yes/no.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y/yes/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What's the highest earner's date of birth?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">We need your date of birth to work out your personal allowance (how much of your income is tax-free).</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2016">2016</option>
-<option value="2015">2015</option>
-<option value="2014">2014</option>
-<option value="2013">2013</option>
-<option value="2012">2012</option>
-<option value="2011">2011</option>
-<option value="2010">2010</option>
-<option value="2009">2009</option>
-<option value="2008">2008</option>
-<option value="2007">2007</option>
-<option value="2006">2006</option>
-<option value="2005">2005</option>
-<option value="2004">2004</option>
-<option value="2003">2003</option>
-<option value="2002">2002</option>
-<option value="2001">2001</option>
-<option value="2000">2000</option>
-<option value="1999">1999</option>
-<option value="1998">1998</option>
-<option value="1997">1997</option>
-<option value="1996">1996</option>
-<option value="1995">1995</option>
-<option value="1994">1994</option>
-<option value="1993">1993</option>
-<option value="1992">1992</option>
-<option value="1991">1991</option>
-<option value="1990">1990</option>
-<option value="1989">1989</option>
-<option value="1988">1988</option>
-<option value="1987">1987</option>
-<option value="1986">1986</option>
-<option value="1985">1985</option>
-<option value="1984">1984</option>
-<option value="1983">1983</option>
-<option value="1982">1982</option>
-<option value="1981">1981</option>
-<option value="1980">1980</option>
-<option value="1979">1979</option>
-<option value="1978">1978</option>
-<option value="1977">1977</option>
-<option value="1976">1976</option>
-<option value="1975">1975</option>
-<option value="1974">1974</option>
-<option value="1973">1973</option>
-<option value="1972">1972</option>
-<option value="1971">1971</option>
-<option value="1970">1970</option>
-<option value="1969">1969</option>
-<option value="1968">1968</option>
-<option value="1967">1967</option>
-<option value="1966">1966</option>
-<option value="1965">1965</option>
-<option value="1964">1964</option>
-<option value="1963">1963</option>
-<option value="1962">1962</option>
-<option value="1961">1961</option>
-<option value="1960">1960</option>
-<option value="1959">1959</option>
-<option value="1958">1958</option>
-<option value="1957">1957</option>
-<option value="1956">1956</option>
-<option value="1955">1955</option>
-<option value="1954">1954</option>
-<option value="1953">1953</option>
-<option value="1952">1952</option>
-<option value="1951">1951</option>
-<option value="1950">1950</option>
-<option value="1949">1949</option>
-<option value="1948">1948</option>
-<option value="1947">1947</option>
-<option value="1946">1946</option>
-<option value="1945">1945</option>
-<option value="1944">1944</option>
-<option value="1943">1943</option>
-<option value="1942">1942</option>
-<option value="1941">1941</option>
-<option value="1940">1940</option>
-<option value="1939">1939</option>
-<option value="1938">1938</option>
-<option value="1937">1937</option>
-<option value="1936">1936</option>
-<option value="1935">1935</option>
-<option value="1934">1934</option>
-<option value="1933">1933</option>
-<option value="1932">1932</option>
-<option value="1931">1931</option>
-<option value="1930">1930</option>
-<option value="1929">1929</option>
-<option value="1928">1928</option>
-<option value="1927">1927</option>
-<option value="1926">1926</option>
-<option value="1925">1925</option>
-<option value="1924">1924</option>
-<option value="1923">1923</option>
-<option value="1922">1922</option>
-<option value="1921">1921</option>
-<option value="1920">1920</option>
-<option value="1919">1919</option>
-<option value="1918">1918</option>
-<option value="1917">1917</option>
-<option value="1916">1916</option>
-<option value="1915">1915</option>
-<option value="1914">1914</option>
-<option value="1913">1913</option>
-<option value="1912">1912</option>
-<option value="1911">1911</option>
-<option value="1910">1910</option>
-<option value="1909">1909</option>
-<option value="1908">1908</option>
-<option value="1907">1907</option>
-<option value="1906">1906</option>
-<option value="1905">1905</option>
-<option value="1904">1904</option>
-<option value="1903">1903</option>
-<option value="1902">1902</option>
-<option value="1901">1901</option>
-<option value="1900">1900</option>
-<option value="1899">1899</option>
-<option value="1898">1898</option>
-<option value="1897">1897</option>
-<option value="1896">1896</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-married-couples-allowance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Were you or your partner born before 6 April 1935?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you or your partner born before 6 April 1935?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you marry before 5 December 2005?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did you marry before 5 December 2005?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/no.txt b/test/artefacts/calculate-married-couples-allowance/yes/no.txt
new file mode 100644
index 00000000000..501ebcc18e0
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/yes/no.txt
@@ -0,0 +1,12 @@
+What's the highest earner's date of birth?
+
+
+
+We need your date of birth to work out your personal allowance (how much of your income is tax-free).
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/no/1955-01-01.html b/test/artefacts/calculate-married-couples-allowance/yes/no/1955-01-01.html
deleted file mode 100644
index ab7ba3d7c11..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/yes/no/1955-01-01.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y/yes/no/1955-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What's the highest earner's yearly income?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer's Allowance.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-married-couples-allowance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Were you or your partner born before 6 April 1935?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you or your partner born before 6 April 1935?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you marry before 5 December 2005?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did you marry before 5 December 2005?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the highest earner's date of birth?</td>
-    <td class="previous-question-body">
-     1 January 1955</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/no?previous_response=1955-01-01">
-      Change<span class="visuallyhidden"> answer to "What's the highest earner's date of birth?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/no/1955-01-01.txt b/test/artefacts/calculate-married-couples-allowance/yes/no/1955-01-01.txt
new file mode 100644
index 00000000000..155ccf8cb54
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/yes/no/1955-01-01.txt
@@ -0,0 +1,12 @@
+What's the highest earner's yearly income?
+
+
+
+Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer's Allowance.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes.html b/test/artefacts/calculate-married-couples-allowance/yes/yes.html
deleted file mode 100644
index 27b3a997d45..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/yes/yes.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What's the husband's date of birth?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">We need your date of birth to work out your personal allowance (how much of your income is tax-free).</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2016">2016</option>
-<option value="2015">2015</option>
-<option value="2014">2014</option>
-<option value="2013">2013</option>
-<option value="2012">2012</option>
-<option value="2011">2011</option>
-<option value="2010">2010</option>
-<option value="2009">2009</option>
-<option value="2008">2008</option>
-<option value="2007">2007</option>
-<option value="2006">2006</option>
-<option value="2005">2005</option>
-<option value="2004">2004</option>
-<option value="2003">2003</option>
-<option value="2002">2002</option>
-<option value="2001">2001</option>
-<option value="2000">2000</option>
-<option value="1999">1999</option>
-<option value="1998">1998</option>
-<option value="1997">1997</option>
-<option value="1996">1996</option>
-<option value="1995">1995</option>
-<option value="1994">1994</option>
-<option value="1993">1993</option>
-<option value="1992">1992</option>
-<option value="1991">1991</option>
-<option value="1990">1990</option>
-<option value="1989">1989</option>
-<option value="1988">1988</option>
-<option value="1987">1987</option>
-<option value="1986">1986</option>
-<option value="1985">1985</option>
-<option value="1984">1984</option>
-<option value="1983">1983</option>
-<option value="1982">1982</option>
-<option value="1981">1981</option>
-<option value="1980">1980</option>
-<option value="1979">1979</option>
-<option value="1978">1978</option>
-<option value="1977">1977</option>
-<option value="1976">1976</option>
-<option value="1975">1975</option>
-<option value="1974">1974</option>
-<option value="1973">1973</option>
-<option value="1972">1972</option>
-<option value="1971">1971</option>
-<option value="1970">1970</option>
-<option value="1969">1969</option>
-<option value="1968">1968</option>
-<option value="1967">1967</option>
-<option value="1966">1966</option>
-<option value="1965">1965</option>
-<option value="1964">1964</option>
-<option value="1963">1963</option>
-<option value="1962">1962</option>
-<option value="1961">1961</option>
-<option value="1960">1960</option>
-<option value="1959">1959</option>
-<option value="1958">1958</option>
-<option value="1957">1957</option>
-<option value="1956">1956</option>
-<option value="1955">1955</option>
-<option value="1954">1954</option>
-<option value="1953">1953</option>
-<option value="1952">1952</option>
-<option value="1951">1951</option>
-<option value="1950">1950</option>
-<option value="1949">1949</option>
-<option value="1948">1948</option>
-<option value="1947">1947</option>
-<option value="1946">1946</option>
-<option value="1945">1945</option>
-<option value="1944">1944</option>
-<option value="1943">1943</option>
-<option value="1942">1942</option>
-<option value="1941">1941</option>
-<option value="1940">1940</option>
-<option value="1939">1939</option>
-<option value="1938">1938</option>
-<option value="1937">1937</option>
-<option value="1936">1936</option>
-<option value="1935">1935</option>
-<option value="1934">1934</option>
-<option value="1933">1933</option>
-<option value="1932">1932</option>
-<option value="1931">1931</option>
-<option value="1930">1930</option>
-<option value="1929">1929</option>
-<option value="1928">1928</option>
-<option value="1927">1927</option>
-<option value="1926">1926</option>
-<option value="1925">1925</option>
-<option value="1924">1924</option>
-<option value="1923">1923</option>
-<option value="1922">1922</option>
-<option value="1921">1921</option>
-<option value="1920">1920</option>
-<option value="1919">1919</option>
-<option value="1918">1918</option>
-<option value="1917">1917</option>
-<option value="1916">1916</option>
-<option value="1915">1915</option>
-<option value="1914">1914</option>
-<option value="1913">1913</option>
-<option value="1912">1912</option>
-<option value="1911">1911</option>
-<option value="1910">1910</option>
-<option value="1909">1909</option>
-<option value="1908">1908</option>
-<option value="1907">1907</option>
-<option value="1906">1906</option>
-<option value="1905">1905</option>
-<option value="1904">1904</option>
-<option value="1903">1903</option>
-<option value="1902">1902</option>
-<option value="1901">1901</option>
-<option value="1900">1900</option>
-<option value="1899">1899</option>
-<option value="1898">1898</option>
-<option value="1897">1897</option>
-<option value="1896">1896</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-married-couples-allowance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Were you or your partner born before 6 April 1935?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you or your partner born before 6 April 1935?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you marry before 5 December 2005?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did you marry before 5 December 2005?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes.txt b/test/artefacts/calculate-married-couples-allowance/yes/yes.txt
new file mode 100644
index 00000000000..07df711c18c
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/yes/yes.txt
@@ -0,0 +1,12 @@
+What's the husband's date of birth?
+
+
+
+We need your date of birth to work out your personal allowance (how much of your income is tax-free).
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01.html b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01.html
deleted file mode 100644
index 327168c4825..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y/yes/yes/1950-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What's the husband's yearly income?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer’s Allowance.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-married-couples-allowance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Were you or your partner born before 6 April 1935?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you or your partner born before 6 April 1935?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you marry before 5 December 2005?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did you marry before 5 December 2005?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the husband's date of birth?</td>
-    <td class="previous-question-body">
-     1 January 1950</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
-      Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01.txt b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01.txt
new file mode 100644
index 00000000000..9de28226045
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01.txt
@@ -0,0 +1,12 @@
+What's the husband's yearly income?
+
+
+
+Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer’s Allowance.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes.html b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes.html
deleted file mode 100644
index 74dbdda2405..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you expect to pay into a pension where your contributions are made before tax is taken away?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>Enter the total you expect to pay for the whole tax year into:</p>
-
-<ul>
-  <li>pension schemes where your contributions are paid before your income is taxed (called ‘net pay arrangements’)</li>
-  <li>retirement annuity contracts (called ‘gross contributions’)</li>
-</ul>
-
-
-      </article>
-
-      <p class="hint">If none, please enter 0.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-married-couples-allowance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Were you or your partner born before 6 April 1935?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you or your partner born before 6 April 1935?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you marry before 5 December 2005?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did you marry before 5 December 2005?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the husband's date of birth?</td>
-    <td class="previous-question-body">
-     1 January 1950</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
-      Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the husband's yearly income?</td>
-    <td class="previous-question-body">
-    £27,701</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01?previous_response=27701.0">
-      Change<span class="visuallyhidden"> answer to "What's the husband's yearly income?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you paying into a pension?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you paying into a pension?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes.txt b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes.txt
new file mode 100644
index 00000000000..a2879da5cae
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes.txt
@@ -0,0 +1,16 @@
+How much do you expect to pay into a pension where your contributions are made before tax is taken away?
+
+Enter the total you expect to pay for the whole tax year into:
+
+- pension schemes where your contributions are paid before your income is taxed (called ‘net pay arrangements’)
+- retirement annuity contracts (called ‘gross contributions’)
+
+
+If none, please enter 0.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.0/5000.html b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.0/5000.html
deleted file mode 100644
index 88d6dad4fc4..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.0/5000.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0/yes/10000.0/5000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you expect to donate to charity through Gift Aid during the entire tax year?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Only enter what you pay - don’t include any tax relief. If none, please enter 0.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-married-couples-allowance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Were you or your partner born before 6 April 1935?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you or your partner born before 6 April 1935?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you marry before 5 December 2005?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did you marry before 5 December 2005?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the husband's date of birth?</td>
-    <td class="previous-question-body">
-     1 January 1950</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
-      Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the husband's yearly income?</td>
-    <td class="previous-question-body">
-    £27,701</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01?previous_response=27701.0">
-      Change<span class="visuallyhidden"> answer to "What's the husband's yearly income?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you paying into a pension?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you paying into a pension?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you expect to pay into a pension where your contributions are made before tax is taken away?</td>
-    <td class="previous-question-body">
-    £10,000</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0/yes?previous_response=10000.0">
-      Change<span class="visuallyhidden"> answer to "How much do you expect to pay into a pension where your contributions are made before tax is taken away?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you expect to pay into a pension this tax year where your pension provider claims tax relief for you?</td>
-    <td class="previous-question-body">
-    £5,000</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0/yes/10000.0?previous_response=5000.0">
-      Change<span class="visuallyhidden"> answer to "How much do you expect to pay into a pension this tax year where your pension provider claims tax relief for you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.0/5000.txt b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.0/5000.txt
new file mode 100644
index 00000000000..a01343edab1
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.0/5000.txt
@@ -0,0 +1,12 @@
+How much do you expect to donate to charity through Gift Aid during the entire tax year?
+
+
+
+Only enter what you pay - don’t include any tax relief. If none, please enter 0.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.html b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.html
deleted file mode 100644
index ecdcf03e2df..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0/yes/10000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you expect to pay into a pension this tax year where your pension provider claims tax relief for you?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Only enter what you pay - don’t include the tax relief. If none, please enter 0.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-married-couples-allowance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Were you or your partner born before 6 April 1935?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you or your partner born before 6 April 1935?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you marry before 5 December 2005?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did you marry before 5 December 2005?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the husband's date of birth?</td>
-    <td class="previous-question-body">
-     1 January 1950</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
-      Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the husband's yearly income?</td>
-    <td class="previous-question-body">
-    £27,701</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01?previous_response=27701.0">
-      Change<span class="visuallyhidden"> answer to "What's the husband's yearly income?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you paying into a pension?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you paying into a pension?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you expect to pay into a pension where your contributions are made before tax is taken away?</td>
-    <td class="previous-question-body">
-    £10,000</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0/yes?previous_response=10000.0">
-      Change<span class="visuallyhidden"> answer to "How much do you expect to pay into a pension where your contributions are made before tax is taken away?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.txt b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.txt
new file mode 100644
index 00000000000..99f61e40ca4
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.0/yes/10000.txt
@@ -0,0 +1,12 @@
+How much do you expect to pay into a pension this tax year where your pension provider claims tax relief for you?
+
+
+
+Only enter what you pay - don’t include the tax relief. If none, please enter 0.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.html b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.html
deleted file mode 100644
index 96d2bc34a11..00000000000
--- a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your Married Couple's Allowance - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your Married Couple's Allowance
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-married-couples-allowance/y/yes/yes/1950-01-01/27701.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you paying into a pension?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-married-couples-allowance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Were you or your partner born before 6 April 1935?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you or your partner born before 6 April 1935?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you marry before 5 December 2005?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did you marry before 5 December 2005?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the husband's date of birth?</td>
-    <td class="previous-question-body">
-     1 January 1950</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
-      Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the husband's yearly income?</td>
-    <td class="previous-question-body">
-    £27,701</td>
-
-  <td class="link-right">
-    <a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01?previous_response=27701.0">
-      Change<span class="visuallyhidden"> answer to "What's the husband's yearly income?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.txt b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.txt
new file mode 100644
index 00000000000..bc2b9dc3039
--- /dev/null
+++ b/test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27701.txt
@@ -0,0 +1,14 @@
+Are you paying into a pension?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes.html
deleted file mode 100644
index 6854e1338ce..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does your employee routinely work different days of the week?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes.txt
new file mode 100644
index 00000000000..6e745813d5b
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes.txt
@@ -0,0 +1,14 @@
+Does your employee routinely work different days of the week?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no.html
deleted file mode 100644
index 3e361bf180a..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    During their most recent period of sickness, when did your employee first become sick?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This includes non-working days and bank holidays.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no.txt
new file mode 100644
index 00000000000..09fda53e073
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no.txt
@@ -0,0 +1,12 @@
+During their most recent period of sickness, when did your employee first become sick?
+
+
+
+This includes non-working days and bank holidays.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02.html
deleted file mode 100644
index 87136a4c266..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Enter the last day of sickness
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This can include non-working days and bank holidays</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02.txt
new file mode 100644
index 00000000000..592b9cc011e
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02.txt
@@ -0,0 +1,12 @@
+Enter the last day of sickness
+
+
+
+This can include non-working days and bank holidays
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10.html
deleted file mode 100644
index e9275b9731f..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>These are called ‘linked Periods of Incapacity for Work (<abbr title="Period of Incapacity for Work">PIW</abbr>)’. Check if an employee’s <a href="/government/publications/statutory-sick-pay-tables-for-linking-periods-of-incapacity-for-work"><abbr title="Period of Incapacity for Work">PIW</abbr> links to a previous one.</a></p>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10.txt
new file mode 100644
index 00000000000..448738e1907
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10.txt
@@ -0,0 +1,17 @@
+Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?
+
+These are called ‘linked Periods of Incapacity for Work (PIW)’. Check if an employee’s [PIW links to a previous one.](/government/publications/statutory-sick-pay-tables-for-linking-periods-of-incapacity-for-work)
+
+*[PIW]: Period of Incapacity for Work
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes.html
deleted file mode 100644
index 18da8c01ca7..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Enter the start date for this linked period of sickness.
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2010">2010</option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes.txt
new file mode 100644
index 00000000000..8840ded583a
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes.txt
@@ -0,0 +1,12 @@
+Enter the start date for this linked period of sickness.
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01.html
deleted file mode 100644
index b23c2c3ce8f..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Enter the end date for this linked period of sickness.
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2010">2010</option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01.txt
new file mode 100644
index 00000000000..302fd2caeda
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01.txt
@@ -0,0 +1,12 @@
+Enter the end date for this linked period of sickness.
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15.html
deleted file mode 100644
index ca0b3543a93..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    On  1 February 2013 had you paid your employee at least 8 weeks of earnings?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="eight_weeks_more" />
-        Yes, paid at least 8 weeks earnings
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="eight_weeks_less" />
-        No, paid less than 8 weeks earnings
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="before_payday" />
-        No, employee is new and fell sick before their first payday
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15.txt
new file mode 100644
index 00000000000..5ae3e987f2a
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15.txt
@@ -0,0 +1,15 @@
+On  1 February 2013 had you paid your employee at least 8 weeks of earnings?
+
+
+
+
+
+  * eight_weeks_more: Yes, paid at least 8 weeks earnings
+  * eight_weeks_less: No, paid less than 8 weeks earnings
+  * before_payday: No, employee is new and fell sick before their first payday
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly.html
deleted file mode 100644
index 0674768d84d..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Enter how much you would have paid the employee on their first payday if they hadn’t been sick.
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On  1 February 2013 had you paid your employee at least 8 weeks of earnings?</td>
-    <td class="previous-question-body">
-    No, employee is new and fell sick before their first payday</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15?previous_response=before_payday">
-      Change<span class="visuallyhidden"> answer to "On  1 February 2013 had you paid your employee at least 8 weeks of earnings?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly.txt
new file mode 100644
index 00000000000..5f6bfbc9486
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly.txt
@@ -0,0 +1,12 @@
+Enter how much you would have paid the employee on their first payday if they hadn’t been sick.
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly/2000.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly/2000.html
deleted file mode 100644
index fc2496d0d14..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly/2000.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly/2000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many days does the period represented by these earnings cover?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If it’s 2 weeks and 3 days enter ‘17’.</p>
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On  1 February 2013 had you paid your employee at least 8 weeks of earnings?</td>
-    <td class="previous-question-body">
-    No, employee is new and fell sick before their first payday</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15?previous_response=before_payday">
-      Change<span class="visuallyhidden"> answer to "On  1 February 2013 had you paid your employee at least 8 weeks of earnings?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter how much you would have paid the employee on their first payday if they hadn’t been sick.</td>
-    <td class="previous-question-body">
-    £2,000</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly?previous_response=2000.0">
-      Change<span class="visuallyhidden"> answer to "Enter how much you would have paid the employee on their first payday if they hadn’t been sick."</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly/2000.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly/2000.txt
new file mode 100644
index 00000000000..f18acf65325
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/before_payday/weekly/2000.txt
@@ -0,0 +1,12 @@
+How many days does the period represented by these earnings cover?
+
+
+
+If it’s 2 weeks and 3 days enter ‘17’.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less.html
deleted file mode 100644
index 045fa2e86db..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Enter the total earnings paid before  1 February 2013.
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On  1 February 2013 had you paid your employee at least 8 weeks of earnings?</td>
-    <td class="previous-question-body">
-    No, paid less than 8 weeks earnings</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15?previous_response=eight_weeks_less">
-      Change<span class="visuallyhidden"> answer to "On  1 February 2013 had you paid your employee at least 8 weeks of earnings?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less.txt
new file mode 100644
index 00000000000..aa9b1934986
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less.txt
@@ -0,0 +1,12 @@
+Enter the total earnings paid before  1 February 2013.
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less/3000.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less/3000.html
deleted file mode 100644
index 2971e448c57..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less/3000.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less/3000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many days does the period represented by these earnings cover?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If it’s 2 weeks and 3 days enter ‘17’.</p>
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On  1 February 2013 had you paid your employee at least 8 weeks of earnings?</td>
-    <td class="previous-question-body">
-    No, paid less than 8 weeks earnings</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15?previous_response=eight_weeks_less">
-      Change<span class="visuallyhidden"> answer to "On  1 February 2013 had you paid your employee at least 8 weeks of earnings?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the total earnings paid before  1 February 2013.</td>
-    <td class="previous-question-body">
-    £3,000</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less?previous_response=3000.0">
-      Change<span class="visuallyhidden"> answer to "Enter the total earnings paid before  1 February 2013."</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less/3000.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less/3000.txt
new file mode 100644
index 00000000000..f18acf65325
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_less/3000.txt
@@ -0,0 +1,12 @@
+How many days does the period represented by these earnings cover?
+
+
+
+If it’s 2 weeks and 3 days enter ‘17’.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more.html
deleted file mode 100644
index a40448eb733..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you pay the employee?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly" />
-        Weekly
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="fortnightly" />
-        Every 2 weeks
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="every_4_weeks" />
-        Every 4 weeks
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="monthly" />
-        Monthly - eg last day or Friday of a month
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="irregularly" />
-        Irregularly
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On  1 February 2013 had you paid your employee at least 8 weeks of earnings?</td>
-    <td class="previous-question-body">
-    Yes, paid at least 8 weeks earnings</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15?previous_response=eight_weeks_more">
-      Change<span class="visuallyhidden"> answer to "On  1 February 2013 had you paid your employee at least 8 weeks of earnings?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more.txt
new file mode 100644
index 00000000000..4ed48c3a9c4
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more.txt
@@ -0,0 +1,17 @@
+How often do you pay the employee?
+
+
+
+
+
+  * weekly: Weekly
+  * fortnightly: Every 2 weeks
+  * every_4_weeks: Every 4 weeks
+  * monthly: Monthly - eg last day or Friday of a month
+  * irregularly: Irregularly
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly.html
deleted file mode 100644
index 2daac04c806..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the last normal payday before  1 February 2013?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2010">2010</option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On  1 February 2013 had you paid your employee at least 8 weeks of earnings?</td>
-    <td class="previous-question-body">
-    Yes, paid at least 8 weeks earnings</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15?previous_response=eight_weeks_more">
-      Change<span class="visuallyhidden"> answer to "On  1 February 2013 had you paid your employee at least 8 weeks of earnings?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly.txt
new file mode 100644
index 00000000000..75fe479e89e
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly.txt
@@ -0,0 +1,12 @@
+What was the last normal payday before  1 February 2013?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31.html
deleted file mode 100644
index 1d17188f771..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31.html
+++ /dev/null
@@ -1,282 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the last normal payday on or before  3 February 2013?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2010">2010</option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On  1 February 2013 had you paid your employee at least 8 weeks of earnings?</td>
-    <td class="previous-question-body">
-    Yes, paid at least 8 weeks earnings</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15?previous_response=eight_weeks_more">
-      Change<span class="visuallyhidden"> answer to "On  1 February 2013 had you paid your employee at least 8 weeks of earnings?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before  1 February 2013?</td>
-    <td class="previous-question-body">
-    31 March 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly?previous_response=2013-03-31">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before  1 February 2013?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31.txt
new file mode 100644
index 00000000000..36c216a7d77
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31.txt
@@ -0,0 +1,12 @@
+What was the last normal payday on or before  3 February 2013?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31.html
deleted file mode 100644
index 679dc6de5b4..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Enter the total amount (before deductions like Income Tax and National Insurance) of your employee’s earnings on paydays between  1 February 2013 and 31 March 2013.
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>Different rules apply for <a href="/statutory-sick-pay-how-different-employment-types-affect-what-you-pay">directors of limited companies incorporated before 1 October 2009</a></p>
-
-
-      </article>
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On  1 February 2013 had you paid your employee at least 8 weeks of earnings?</td>
-    <td class="previous-question-body">
-    Yes, paid at least 8 weeks earnings</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15?previous_response=eight_weeks_more">
-      Change<span class="visuallyhidden"> answer to "On  1 February 2013 had you paid your employee at least 8 weeks of earnings?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before  1 February 2013?</td>
-    <td class="previous-question-body">
-    31 March 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly?previous_response=2013-03-31">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before  1 February 2013?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before  3 February 2013?</td>
-    <td class="previous-question-body">
-    31 January 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31?previous_response=2013-01-31">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before  3 February 2013?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31.txt
new file mode 100644
index 00000000000..0119f5a37a9
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31.txt
@@ -0,0 +1,13 @@
+Enter the total amount (before deductions like Income Tax and National Insurance) of your employee’s earnings on paydays between  1 February 2013 and 31 March 2013.
+
+Different rules apply for [directors of limited companies incorporated before 1 October 2009](/statutory-sick-pay-how-different-employment-types-affect-what-you-pay)
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31/200.html b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31/200.html
deleted file mode 100644
index 55e44110f1d..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31/200.html
+++ /dev/null
@@ -1,279 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31/200.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which days of the week do they usually work?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="1" />
-        Monday
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="2" />
-        Tuesday
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="3" />
-        Wednesday
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="4" />
-        Thursday
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="5" />
-        Friday
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="6" />
-        Saturday
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="checkbox" name="response[]" id="response_6" value="0" />
-        Sunday
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does your employee routinely work different days of the week?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does your employee routinely work different days of the week?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">During their most recent period of sickness, when did your employee first become sick?</td>
-    <td class="previous-question-body">
-     2 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no?previous_response=2013-04-02">
-      Change<span class="visuallyhidden"> answer to "During their most recent period of sickness, when did your employee first become sick?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the last day of sickness</td>
-    <td class="previous-question-body">
-    10 April 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02?previous_response=2013-04-10">
-      Change<span class="visuallyhidden"> answer to "Enter the last day of sickness"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the start date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-     1 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes?previous_response=2013-02-01">
-      Change<span class="visuallyhidden"> answer to "Enter the start date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the end date for this linked period of sickness.</td>
-    <td class="previous-question-body">
-    15 February 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01?previous_response=2013-02-15">
-      Change<span class="visuallyhidden"> answer to "Enter the end date for this linked period of sickness."</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On  1 February 2013 had you paid your employee at least 8 weeks of earnings?</td>
-    <td class="previous-question-body">
-    Yes, paid at least 8 weeks earnings</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15?previous_response=eight_weeks_more">
-      Change<span class="visuallyhidden"> answer to "On  1 February 2013 had you paid your employee at least 8 weeks of earnings?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before  1 February 2013?</td>
-    <td class="previous-question-body">
-    31 March 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly?previous_response=2013-03-31">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before  1 February 2013?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before  3 February 2013?</td>
-    <td class="previous-question-body">
-    31 January 2013</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31?previous_response=2013-01-31">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before  3 February 2013?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Enter the total amount (before deductions like Income Tax and National Insurance) of your employee’s earnings on paydays between  1 February 2013 and 31 March 2013.</td>
-    <td class="previous-question-body">
-    £200</td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31?previous_response=200.0">
-      Change<span class="visuallyhidden"> answer to "Enter the total amount (before deductions like Income Tax and National Insurance) of your employee’s earnings on paydays between  1 February 2013 and 31 March 2013."</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31/200.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31/200.txt
new file mode 100644
index 00000000000..dcf155e5ec8
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_adoption_pay,statutory_paternity_pay/yes/no/2013-04-02/2013-04-10/yes/2013-02-01/2013-02-15/eight_weeks_more/weekly/2013-03-31/2013-01-31/200.txt
@@ -0,0 +1,19 @@
+Which days of the week do they usually work?
+
+
+
+
+
+  * 1: Monday
+  * 2: Tuesday
+  * 3: Wednesday
+  * 4: Thursday
+  * 5: Friday
+  * 6: Saturday
+  * 0: Sunday
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_paternity_pay,statutory_adoption_pay.html b/test/artefacts/calculate-statutory-sick-pay/statutory_paternity_pay,statutory_adoption_pay.html
deleted file mode 100644
index 0825bef588c..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/statutory_paternity_pay,statutory_adoption_pay.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y/statutory_adoption_pay,statutory_paternity_pay" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-statutory-sick-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is your employee getting any of the following?</td>
-    <td class="previous-question-body"><ul>
-      <li>Statutory Adoption Pay</li>
-      <li>Statutory Paternity Pay</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/calculate-statutory-sick-pay/y?previous_response=statutory_adoption_pay%2Cstatutory_paternity_pay">
-      Change<span class="visuallyhidden"> answer to "Is your employee getting any of the following?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/statutory_paternity_pay,statutory_adoption_pay.txt b/test/artefacts/calculate-statutory-sick-pay/statutory_paternity_pay,statutory_adoption_pay.txt
new file mode 100644
index 00000000000..f7db2dff95a
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/statutory_paternity_pay,statutory_adoption_pay.txt
@@ -0,0 +1,14 @@
+Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-statutory-sick-pay/y.html b/test/artefacts/calculate-statutory-sick-pay/y.html
deleted file mode 100644
index 1b9d44fd789..00000000000
--- a/test/artefacts/calculate-statutory-sick-pay/y.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your employee's statutory sick pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your employee's statutory sick pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-statutory-sick-pay/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is your employee getting any of the following?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If none apply just click ‘Next step’</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="statutory_maternity_pay" />
-        Statutory Maternity Pay
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="maternity_allowance" />
-        Maternity Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="statutory_paternity_pay" />
-        Statutory Paternity Pay
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="statutory_adoption_pay" />
-        Statutory Adoption Pay
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="additional_statutory_paternity_pay" />
-        Additional Statutory Paternity Pay
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-statutory-sick-pay/y.txt b/test/artefacts/calculate-statutory-sick-pay/y.txt
new file mode 100644
index 00000000000..ebed89c0c7b
--- /dev/null
+++ b/test/artefacts/calculate-statutory-sick-pay/y.txt
@@ -0,0 +1,17 @@
+Is your employee getting any of the following?
+
+
+
+If none apply just click ‘Next step’
+
+  * statutory_maternity_pay: Statutory Maternity Pay
+  * maternity_allowance: Maternity Allowance
+  * statutory_paternity_pay: Statutory Paternity Pay
+  * statutory_adoption_pay: Statutory Adoption Pay
+  * additional_statutory_paternity_pay: Additional Statutory Paternity Pay
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-child-maintenance/pay.html b/test/artefacts/calculate-your-child-maintenance/pay.html
deleted file mode 100644
index 5b7ba6a439c..00000000000
--- a/test/artefacts/calculate-your-child-maintenance/pay.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Child maintenance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Child maintenance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-child-maintenance/y/pay" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many children are you paying child maintenance for?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Enter the total number of children - including children that you have family based arrangements for. They will be included in the calculation and you'll need to supply information about them when arranging Child Maintenance.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="1_child" />
-        1
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="2_children" />
-        2
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="3_children" />
-        3 or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-child-maintenance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you be paying or receiving child maintenance payments?</td>
-    <td class="previous-question-body">
-    paying</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y?previous_response=pay">
-      Change<span class="visuallyhidden"> answer to "Will you be paying or receiving child maintenance payments?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-child-maintenance/pay.txt b/test/artefacts/calculate-your-child-maintenance/pay.txt
new file mode 100644
index 00000000000..b1fb1f9280f
--- /dev/null
+++ b/test/artefacts/calculate-your-child-maintenance/pay.txt
@@ -0,0 +1,15 @@
+How many children are you paying child maintenance for?
+
+
+
+Enter the total number of children - including children that you have family based arrangements for. They will be included in the calculation and you'll need to supply information about them when arranging Child Maintenance.
+
+  * 1_child: 1
+  * 2_children: 2
+  * 3_children: 3 or more
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-child-maintenance/pay/1_child.html b/test/artefacts/calculate-your-child-maintenance/pay/1_child.html
deleted file mode 100644
index f58598fe808..00000000000
--- a/test/artefacts/calculate-your-child-maintenance/pay/1_child.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Child maintenance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Child maintenance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-child-maintenance/y/pay/1_child" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you get any of these benefits?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>Income Support</li>
-  <li>income-based Jobseeker’s Allowance</li>
-  <li>income-related Employment and Support Allowance</li>
-  <li>Pension Credit</li>
-  <li>contribution-based Jobseeker’s Allowance</li>
-  <li>contribution-based Employment and Support Allowance</li>
-  <li>State Pension</li>
-  <li>Incapacity Benefit</li>
-  <li>Training Allowance</li>
-  <li>Armed Forces Compensation Scheme payments</li>
-  <li>War Disablement Pension</li>
-  <li>Bereavement Allowance</li>
-  <li>Carer’s Allowance</li>
-  <li>Maternity Allowance</li>
-  <li>Severe Disablement Allowance</li>
-  <li>Industrial Injuries Disablement Benefit</li>
-  <li>Widowed Parent’s Allowance</li>
-  <li>Widow’s pension</li>
-  <li>Universal Credit with no earned income</li>
-</ul>
-
-
-      </article>
-
-      <p class="hint">In Scotland, this also includes: Skillseekers training, War Widow’s, Widower’s or Surviving Civil Partner’s Pension</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-child-maintenance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you be paying or receiving child maintenance payments?</td>
-    <td class="previous-question-body">
-    paying</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y?previous_response=pay">
-      Change<span class="visuallyhidden"> answer to "Will you be paying or receiving child maintenance payments?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many children are you paying child maintenance for?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y/pay?previous_response=1_child">
-      Change<span class="visuallyhidden"> answer to "How many children are you paying child maintenance for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-child-maintenance/pay/1_child.txt b/test/artefacts/calculate-your-child-maintenance/pay/1_child.txt
new file mode 100644
index 00000000000..5b396af72f2
--- /dev/null
+++ b/test/artefacts/calculate-your-child-maintenance/pay/1_child.txt
@@ -0,0 +1,33 @@
+Do you get any of these benefits?
+
+- Income Support
+- income-based Jobseeker’s Allowance
+- income-related Employment and Support Allowance
+- Pension Credit
+- contribution-based Jobseeker’s Allowance
+- contribution-based Employment and Support Allowance
+- State Pension
+- Incapacity Benefit
+- Training Allowance
+- Armed Forces Compensation Scheme payments
+- War Disablement Pension
+- Bereavement Allowance
+- Carer’s Allowance
+- Maternity Allowance
+- Severe Disablement Allowance
+- Industrial Injuries Disablement Benefit
+- Widowed Parent’s Allowance
+- Widow’s pension
+- Universal Credit with no earned income
+
+
+In Scotland, this also includes: Skillseekers training, War Widow’s, Widower’s or Surviving Civil Partner’s Pension
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-child-maintenance/pay/1_child/no.html b/test/artefacts/calculate-your-child-maintenance/pay/1_child/no.html
deleted file mode 100644
index f294dfa45b1..00000000000
--- a/test/artefacts/calculate-your-child-maintenance/pay/1_child/no.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Child maintenance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Child maintenance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-child-maintenance/y/pay/1_child/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is your weekly gross income?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This is income before tax and National Insurance but after pension contributions.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per week</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-child-maintenance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you be paying or receiving child maintenance payments?</td>
-    <td class="previous-question-body">
-    paying</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y?previous_response=pay">
-      Change<span class="visuallyhidden"> answer to "Will you be paying or receiving child maintenance payments?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many children are you paying child maintenance for?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y/pay?previous_response=1_child">
-      Change<span class="visuallyhidden"> answer to "How many children are you paying child maintenance for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you get any of these benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y/pay/1_child?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you get any of these benefits?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-child-maintenance/pay/1_child/no.txt b/test/artefacts/calculate-your-child-maintenance/pay/1_child/no.txt
new file mode 100644
index 00000000000..2195b6f4d6f
--- /dev/null
+++ b/test/artefacts/calculate-your-child-maintenance/pay/1_child/no.txt
@@ -0,0 +1,12 @@
+What is your weekly gross income?
+
+
+
+This is income before tax and National Insurance but after pension contributions.
+
+
+
+
+per week
+
+
diff --git a/test/artefacts/calculate-your-child-maintenance/pay/1_child/no/150.html b/test/artefacts/calculate-your-child-maintenance/pay/1_child/no/150.html
deleted file mode 100644
index 25e5c35b646..00000000000
--- a/test/artefacts/calculate-your-child-maintenance/pay/1_child/no/150.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Child maintenance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Child maintenance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-child-maintenance/y/pay/1_child/no/150.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many other children live in your household?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Enter 0 if no children live there. Don’t count the children child maintenance has to be paid for.</p>
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-child-maintenance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you be paying or receiving child maintenance payments?</td>
-    <td class="previous-question-body">
-    paying</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y?previous_response=pay">
-      Change<span class="visuallyhidden"> answer to "Will you be paying or receiving child maintenance payments?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many children are you paying child maintenance for?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y/pay?previous_response=1_child">
-      Change<span class="visuallyhidden"> answer to "How many children are you paying child maintenance for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you get any of these benefits?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y/pay/1_child?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you get any of these benefits?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is your weekly gross income?</td>
-    <td class="previous-question-body">
-    £150</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y/pay/1_child/no?previous_response=150.0">
-      Change<span class="visuallyhidden"> answer to "What is your weekly gross income?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-child-maintenance/pay/1_child/no/150.txt b/test/artefacts/calculate-your-child-maintenance/pay/1_child/no/150.txt
new file mode 100644
index 00000000000..d868d629647
--- /dev/null
+++ b/test/artefacts/calculate-your-child-maintenance/pay/1_child/no/150.txt
@@ -0,0 +1,12 @@
+How many other children live in your household?
+
+
+
+Enter 0 if no children live there. Don’t count the children child maintenance has to be paid for.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-child-maintenance/pay/1_child/yes.html b/test/artefacts/calculate-your-child-maintenance/pay/1_child/yes.html
deleted file mode 100644
index 3c305e8cb17..00000000000
--- a/test/artefacts/calculate-your-child-maintenance/pay/1_child/yes.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Child maintenance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Child maintenance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-child-maintenance/y/pay/1_child/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    On average, how many nights a year do the children stay over with you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        Less than 52 (less than once a week)
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="1" />
-        52 to 103 (1 to 2 nights a week)
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="2" />
-        104 to 155 (2 to 3 nights a week)
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="3" />
-        156 to 174 (approx. 3 nights a week)
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="4" />
-        175 or more (more than 3 nights a week)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-child-maintenance">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you be paying or receiving child maintenance payments?</td>
-    <td class="previous-question-body">
-    paying</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y?previous_response=pay">
-      Change<span class="visuallyhidden"> answer to "Will you be paying or receiving child maintenance payments?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many children are you paying child maintenance for?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y/pay?previous_response=1_child">
-      Change<span class="visuallyhidden"> answer to "How many children are you paying child maintenance for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you get any of these benefits?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-child-maintenance/y/pay/1_child?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you get any of these benefits?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-child-maintenance/pay/1_child/yes.txt b/test/artefacts/calculate-your-child-maintenance/pay/1_child/yes.txt
new file mode 100644
index 00000000000..5c15c16a50d
--- /dev/null
+++ b/test/artefacts/calculate-your-child-maintenance/pay/1_child/yes.txt
@@ -0,0 +1,17 @@
+On average, how many nights a year do the children stay over with you?
+
+
+
+
+
+  * 0: Less than 52 (less than once a week)
+  * 1: 52 to 103 (1 to 2 nights a week)
+  * 2: 104 to 155 (2 to 3 nights a week)
+  * 3: 156 to 174 (approx. 3 nights a week)
+  * 4: 175 or more (more than 3 nights a week)
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-child-maintenance/y.html b/test/artefacts/calculate-your-child-maintenance/y.html
deleted file mode 100644
index 57bc32b7997..00000000000
--- a/test/artefacts/calculate-your-child-maintenance/y.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Child maintenance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Child maintenance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-child-maintenance/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Will you be paying or receiving child maintenance payments?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="pay" />
-        paying
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="receive" />
-        receiving
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-child-maintenance/y.txt b/test/artefacts/calculate-your-child-maintenance/y.txt
new file mode 100644
index 00000000000..1e3053aea75
--- /dev/null
+++ b/test/artefacts/calculate-your-child-maintenance/y.txt
@@ -0,0 +1,14 @@
+Will you be paying or receiving child maintenance payments?
+
+
+
+
+
+  * pay: paying
+  * receive: receiving
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.html b/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.html
deleted file mode 100644
index 262762fb066..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/annualised-hours" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours will be worked a year?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This is calculated by excluding statutory entitlement. This calculation isn't suitable for term-time workers.</p>
-
-    <div class="">
-
-      <label for="response">Hours per year<input type="text" name="response" id="response" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    annualised hours</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=annualised-hours">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.txt b/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.txt
new file mode 100644
index 00000000000..ff9fd3d4387
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/annualised-hours.txt
@@ -0,0 +1,12 @@
+How many hours will be worked a year?
+
+
+
+This is calculated by excluding statutory entitlement. This calculation isn't suitable for term-time workers.
+
+
+Hours per year
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.html b/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.html
deleted file mode 100644
index 354394d5539..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/casual-or-irregular-hours" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours have been worked in this leave year?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The holiday entitlement may be calculated as the leave builds up ('accrues') for each hour worked.</p>
-
-    <div class="">
-
-      <label for="response">Hours worked<input type="text" name="response" id="response" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    casual or irregular hours</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=casual-or-irregular-hours">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.txt b/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.txt
new file mode 100644
index 00000000000..c3005ac594e
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/casual-or-irregular-hours.txt
@@ -0,0 +1,12 @@
+How many hours have been worked in this leave year?
+
+
+
+The holiday entitlement may be calculated as the leave builds up ('accrues') for each hour worked.
+
+
+Hours worked
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.html b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.html
deleted file mode 100644
index 41959d7f4e4..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/compressed-hours" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours are worked per week?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">Hours per week<input type="text" name="response" id="response" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    compressed hours</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=compressed-hours">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.txt b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.txt
new file mode 100644
index 00000000000..af99ef76fd8
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours.txt
@@ -0,0 +1,12 @@
+How many hours are worked per week?
+
+
+
+
+
+
+Hours per week
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.html b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.html
deleted file mode 100644
index d788f59287b..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/compressed-hours/8.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Number of days per week worked?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">Days per week<input type="text" name="response" id="response" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    compressed hours</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=compressed-hours">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours are worked per week?</td>
-    <td class="previous-question-body">
-    8.0</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/compressed-hours?previous_response=8.0">
-      Change<span class="visuallyhidden"> answer to "How many hours are worked per week?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.txt b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.txt
new file mode 100644
index 00000000000..c0c835e08ea
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/compressed-hours/8.txt
@@ -0,0 +1,12 @@
+Number of days per week worked?
+
+
+
+
+
+
+Days per week
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.html
deleted file mode 100644
index c0055697a55..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/days-worked-per-week" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you want to work out holiday:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="full-year" />
-        for a full leave year
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="starting" />
-        for someone starting part way through a leave year
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="leaving" />
-        for someone leaving part way through a leave year
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="starting-and-leaving" />
-        for someone starting and leaving part way through a leave year
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    days worked per week</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=days-worked-per-week">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.txt b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.txt
new file mode 100644
index 00000000000..587b48fad0c
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week.txt
@@ -0,0 +1,16 @@
+Do you want to work out holiday:
+
+
+
+
+
+  * full-year: for a full leave year
+  * starting: for someone starting part way through a leave year
+  * leaving: for someone leaving part way through a leave year
+  * starting-and-leaving: for someone starting and leaving part way through a leave year
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.html
deleted file mode 100644
index b9e9b4ced90..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/days-worked-per-week/full-year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Number of days worked per week?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you work half-days enter .5 for a half, eg 3.5 for three and a half days.</p>
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    days worked per week</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=days-worked-per-week">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you want to work out holiday:</td>
-    <td class="previous-question-body">
-    for a full leave year</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/days-worked-per-week?previous_response=full-year">
-      Change<span class="visuallyhidden"> answer to "Do you want to work out holiday:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.txt b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.txt
new file mode 100644
index 00000000000..4a11c1bbd52
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/full-year.txt
@@ -0,0 +1,12 @@
+Number of days worked per week?
+
+
+
+If you work half-days enter .5 for a half, eg 3.5 for three and a half days.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.html
deleted file mode 100644
index d6f35bc132b..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/days-worked-per-week/leaving" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the employment end date?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    days worked per week</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=days-worked-per-week">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you want to work out holiday:</td>
-    <td class="previous-question-body">
-    for someone leaving part way through a leave year</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/days-worked-per-week?previous_response=leaving">
-      Change<span class="visuallyhidden"> answer to "Do you want to work out holiday:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.txt b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.txt
new file mode 100644
index 00000000000..6f65581905b
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/leaving.txt
@@ -0,0 +1,12 @@
+What was the employment end date?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.html
deleted file mode 100644
index dca3a3185b5..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/days-worked-per-week/starting" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the employment start date?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    days worked per week</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=days-worked-per-week">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you want to work out holiday:</td>
-    <td class="previous-question-body">
-    for someone starting part way through a leave year</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/days-worked-per-week?previous_response=starting">
-      Change<span class="visuallyhidden"> answer to "Do you want to work out holiday:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.txt b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.txt
new file mode 100644
index 00000000000..17590ec3b3c
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting.txt
@@ -0,0 +1,12 @@
+What was the employment start date?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.html b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.html
deleted file mode 100644
index 584859c7d8f..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/days-worked-per-week/starting/2012-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When does the leave year start?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This is usually in the employment contract. If it isn’t and the job was started after 1 October 1998, the leave year will start on the 1st day of the job. If the job was started on or before 1 October 1998, the leave year will start on 1 October.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    days worked per week</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=days-worked-per-week">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you want to work out holiday:</td>
-    <td class="previous-question-body">
-    for someone starting part way through a leave year</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/days-worked-per-week?previous_response=starting">
-      Change<span class="visuallyhidden"> answer to "Do you want to work out holiday:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the employment start date?</td>
-    <td class="previous-question-body">
-     1 January 2012</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/days-worked-per-week/starting?previous_response=2012-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the employment start date?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.txt b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.txt
new file mode 100644
index 00000000000..0ae35acd695
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/days-worked-per-week/starting/2012-01-01.txt
@@ -0,0 +1,12 @@
+When does the leave year start?
+
+
+
+This is usually in the employment contract. If it isn’t and the job was started after 1 October 1998, the leave year will start on the 1st day of the job. If the job was started on or before 1 October 1998, the leave year will start on 1 October.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.html b/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.html
deleted file mode 100644
index 3f91b153c0b..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/hours-worked-per-week/full-year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Number of hours worked per week?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you work half-hours enter .5 for a half, eg 40.5.</p>
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    hours worked per week</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=hours-worked-per-week">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you want to work out holiday:</td>
-    <td class="previous-question-body">
-    for a full leave year</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/hours-worked-per-week?previous_response=full-year">
-      Change<span class="visuallyhidden"> answer to "Do you want to work out holiday:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.txt b/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.txt
new file mode 100644
index 00000000000..5415d360d3d
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/hours-worked-per-week/full-year.txt
@@ -0,0 +1,12 @@
+Number of hours worked per week?
+
+
+
+If you work half-hours enter .5 for a half, eg 40.5.
+
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker.html b/test/artefacts/calculate-your-holiday-entitlement/shift-worker.html
deleted file mode 100644
index 11357d29108..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/shift-worker.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/shift-worker" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you want to calculate the holiday:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="full-year" />
-        for a full leave year
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="starting" />
-        for someone starting part way through a leave year
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="leaving" />
-        for someone leaving part way through a leave year
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="starting-and-leaving" />
-        for someone starting and leaving part way through a leave year
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    shifts</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=shift-worker">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker.txt b/test/artefacts/calculate-your-holiday-entitlement/shift-worker.txt
new file mode 100644
index 00000000000..201cee86ea6
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/shift-worker.txt
@@ -0,0 +1,16 @@
+Do you want to calculate the holiday:
+
+
+
+
+
+  * full-year: for a full leave year
+  * starting: for someone starting part way through a leave year
+  * leaving: for someone leaving part way through a leave year
+  * starting-and-leaving: for someone starting and leaving part way through a leave year
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.html b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.html
deleted file mode 100644
index e711279c838..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/shift-worker/full-year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours in each shift?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">Hours per shift<input type="text" name="response" id="response" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    shifts</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=shift-worker">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you want to calculate the holiday:</td>
-    <td class="previous-question-body">
-    for a full leave year</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/shift-worker?previous_response=full-year">
-      Change<span class="visuallyhidden"> answer to "Do you want to calculate the holiday:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.txt b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.txt
new file mode 100644
index 00000000000..cd4eb95287c
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year.txt
@@ -0,0 +1,12 @@
+How many hours in each shift?
+
+
+
+
+
+
+Hours per shift
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.html b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.html
deleted file mode 100644
index 24242f835a1..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/shift-worker/full-year/8.0/3" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many days in the shift pattern?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The shift pattern includes non-working days.</p>
-
-    <div class="">
-
-      <label for="response">Days per pattern<input type="text" name="response" id="response" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    shifts</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=shift-worker">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you want to calculate the holiday:</td>
-    <td class="previous-question-body">
-    for a full leave year</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/shift-worker?previous_response=full-year">
-      Change<span class="visuallyhidden"> answer to "Do you want to calculate the holiday:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours in each shift?</td>
-    <td class="previous-question-body">
-    8.0</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/shift-worker/full-year?previous_response=8.0">
-      Change<span class="visuallyhidden"> answer to "How many hours in each shift?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many shifts will be worked per shift pattern?</td>
-    <td class="previous-question-body">
-    3</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/shift-worker/full-year/8.0?previous_response=3">
-      Change<span class="visuallyhidden"> answer to "How many shifts will be worked per shift pattern?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.txt b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.txt
new file mode 100644
index 00000000000..42ef3ff6033
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.0/3.txt
@@ -0,0 +1,12 @@
+How many days in the shift pattern?
+
+
+
+The shift pattern includes non-working days.
+
+
+Days per pattern
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.html b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.html
deleted file mode 100644
index 4dfcc54bf03..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y/shift-worker/full-year/8.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many shifts will be worked per shift pattern?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">Shifts per pattern<input type="text" name="response" id="response" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-holiday-entitlement">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Is the holiday entitlement based on:</td>
-    <td class="previous-question-body">
-    shifts</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y?previous_response=shift-worker">
-      Change<span class="visuallyhidden"> answer to "Is the holiday entitlement based on:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you want to calculate the holiday:</td>
-    <td class="previous-question-body">
-    for a full leave year</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/shift-worker?previous_response=full-year">
-      Change<span class="visuallyhidden"> answer to "Do you want to calculate the holiday:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours in each shift?</td>
-    <td class="previous-question-body">
-    8.0</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-holiday-entitlement/y/shift-worker/full-year?previous_response=8.0">
-      Change<span class="visuallyhidden"> answer to "How many hours in each shift?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.txt b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.txt
new file mode 100644
index 00000000000..5ef3918b881
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/shift-worker/full-year/8.txt
@@ -0,0 +1,12 @@
+How many shifts will be worked per shift pattern?
+
+
+
+
+
+
+Shifts per pattern
+
+
+
+
diff --git a/test/artefacts/calculate-your-holiday-entitlement/y.html b/test/artefacts/calculate-your-holiday-entitlement/y.html
deleted file mode 100644
index af9f1f2ec84..00000000000
--- a/test/artefacts/calculate-your-holiday-entitlement/y.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate holiday entitlement - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate holiday entitlement
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-holiday-entitlement/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the holiday entitlement based on:
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Check the employment contract if you’re not sure about the holiday entitlement.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="days-worked-per-week" />
-        days worked per week
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="hours-worked-per-week" />
-        hours worked per week
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="casual-or-irregular-hours" />
-        casual or irregular hours
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="annualised-hours" />
-        annualised hours
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="compressed-hours" />
-        compressed hours
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="shift-worker" />
-        shifts
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-holiday-entitlement/y.txt b/test/artefacts/calculate-your-holiday-entitlement/y.txt
new file mode 100644
index 00000000000..6eb071c054b
--- /dev/null
+++ b/test/artefacts/calculate-your-holiday-entitlement/y.txt
@@ -0,0 +1,18 @@
+Is the holiday entitlement based on:
+
+
+
+Check the employment contract if you’re not sure about the holiday entitlement.
+
+  * days-worked-per-week: days worked per week
+  * hours-worked-per-week: hours worked per week
+  * casual-or-irregular-hours: casual or irregular hours
+  * annualised-hours: annualised hours
+  * compressed-hours: compressed hours
+  * shift-worker: shifts
+
+
+
+
+
+
diff --git a/test/artefacts/calculate-your-redundancy-pay/2012-01-01.html b/test/artefacts/calculate-your-redundancy-pay/2012-01-01.html
deleted file mode 100644
index 6419b4e7887..00000000000
--- a/test/artefacts/calculate-your-redundancy-pay/2012-01-01.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your statutory redundancy pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your statutory redundancy pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-redundancy-pay/y/2012-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old were you on the date you were made redundant?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />years old</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-redundancy-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What date were you made redundant?</td>
-    <td class="previous-question-body">
-     1 January 2012</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-redundancy-pay/y?previous_response=2012-01-01">
-      Change<span class="visuallyhidden"> answer to "What date were you made redundant?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-redundancy-pay/2012-01-01.txt b/test/artefacts/calculate-your-redundancy-pay/2012-01-01.txt
new file mode 100644
index 00000000000..b2e42726ecd
--- /dev/null
+++ b/test/artefacts/calculate-your-redundancy-pay/2012-01-01.txt
@@ -0,0 +1,12 @@
+How old were you on the date you were made redundant?
+
+
+
+
+
+
+
+
+years old
+
+
diff --git a/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21.html b/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21.html
deleted file mode 100644
index b001a74e2b8..00000000000
--- a/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your statutory redundancy pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your statutory redundancy pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-redundancy-pay/y/2012-01-01/21" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many years have you worked for your employer?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Only count full years of service. For example, 3 years and 9 months count as 3 years.</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />full years worked</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-redundancy-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What date were you made redundant?</td>
-    <td class="previous-question-body">
-     1 January 2012</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-redundancy-pay/y?previous_response=2012-01-01">
-      Change<span class="visuallyhidden"> answer to "What date were you made redundant?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you on the date you were made redundant?</td>
-    <td class="previous-question-body">
-    21</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-redundancy-pay/y/2012-01-01?previous_response=21">
-      Change<span class="visuallyhidden"> answer to "How old were you on the date you were made redundant?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21.txt b/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21.txt
new file mode 100644
index 00000000000..d401ed66083
--- /dev/null
+++ b/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21.txt
@@ -0,0 +1,12 @@
+How many years have you worked for your employer?
+
+
+
+Only count full years of service. For example, 3 years and 9 months count as 3 years.
+
+
+
+
+full years worked
+
+
diff --git a/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21/3.html b/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21/3.html
deleted file mode 100644
index e876527e4ea..00000000000
--- a/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21/3.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your statutory redundancy pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your statutory redundancy pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-redundancy-pay/y/2012-01-01/21/3.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is your weekly pay before tax and any other deductions?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Examples of other deductions include student loans and child maintenance.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per week</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/calculate-your-redundancy-pay">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What date were you made redundant?</td>
-    <td class="previous-question-body">
-     1 January 2012</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-redundancy-pay/y?previous_response=2012-01-01">
-      Change<span class="visuallyhidden"> answer to "What date were you made redundant?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old were you on the date you were made redundant?</td>
-    <td class="previous-question-body">
-    21</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-redundancy-pay/y/2012-01-01?previous_response=21">
-      Change<span class="visuallyhidden"> answer to "How old were you on the date you were made redundant?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many years have you worked for your employer?</td>
-    <td class="previous-question-body">
-    3.0</td>
-
-  <td class="link-right">
-    <a href="/calculate-your-redundancy-pay/y/2012-01-01/21?previous_response=3.0">
-      Change<span class="visuallyhidden"> answer to "How many years have you worked for your employer?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21/3.txt b/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21/3.txt
new file mode 100644
index 00000000000..b693fe6d3c2
--- /dev/null
+++ b/test/artefacts/calculate-your-redundancy-pay/2012-01-01/21/3.txt
@@ -0,0 +1,12 @@
+What is your weekly pay before tax and any other deductions?
+
+
+
+Examples of other deductions include student loans and child maintenance.
+
+
+
+
+per week
+
+
diff --git a/test/artefacts/calculate-your-redundancy-pay/y.html b/test/artefacts/calculate-your-redundancy-pay/y.html
deleted file mode 100644
index 4b48af82869..00000000000
--- a/test/artefacts/calculate-your-redundancy-pay/y.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your statutory redundancy pay - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your statutory redundancy pay
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/calculate-your-redundancy-pay/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What date were you made redundant?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Use the original redundancy date even if your notice is brought forward, you’re paid in lieu of notice or made redundant after trialing a new job.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/calculate-your-redundancy-pay/y.txt b/test/artefacts/calculate-your-redundancy-pay/y.txt
new file mode 100644
index 00000000000..f07b0ecc9e0
--- /dev/null
+++ b/test/artefacts/calculate-your-redundancy-pay/y.txt
@@ -0,0 +1,12 @@
+What date were you made redundant?
+
+
+
+Use the original redundancy date even if your notice is brought forward, you’re paid in lieu of notice or made redundant after trialing a new job.
+
+
+
+
+
+
+
diff --git a/test/artefacts/check-uk-visa/afghanistan.html b/test/artefacts/check-uk-visa/afghanistan.html
deleted file mode 100644
index 9708043fc1c..00000000000
--- a/test/artefacts/check-uk-visa/afghanistan.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if you need a UK visa - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if you need a UK visa
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/check-uk-visa/y/afghanistan" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What are you coming to the UK to do?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="tourism" />
-        Tourism, including visiting friends or family
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="work" />
-        Work, academic visit or business
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="study" />
-        Study
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="transit" />
-        Transit (on your way to somewhere else)
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="family" />
-        Join partner or family for a long stay
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="marriage" />
-        Get married or enter into a civil partnership
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="school" />
-        Visit your child at school
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="radio" name="response" id="response_7" value="medical" />
-        Get private medical treatment
-      </label>
-    </li>
-    <li>
-      <label for="response_8" class="selectable">
-        <input type="radio" name="response" id="response_8" value="diplomatic" />
-        For official diplomatic or government business (including transit through the UK)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/check-uk-visa">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What’s your nationality as shown on your passport or travel document?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/check-uk-visa/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "What’s your nationality as shown on your passport or travel document?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/check-uk-visa/afghanistan.txt b/test/artefacts/check-uk-visa/afghanistan.txt
new file mode 100644
index 00000000000..a0936a94f95
--- /dev/null
+++ b/test/artefacts/check-uk-visa/afghanistan.txt
@@ -0,0 +1,21 @@
+What are you coming to the UK to do?
+
+
+
+
+
+  * tourism: Tourism, including visiting friends or family
+  * work: Work, academic visit or business
+  * study: Study
+  * transit: Transit (on your way to somewhere else)
+  * family: Join partner or family for a long stay
+  * marriage: Get married or enter into a civil partnership
+  * school: Visit your child at school
+  * medical: Get private medical treatment
+  * diplomatic: For official diplomatic or government business (including transit through the UK)
+
+
+
+
+
+
diff --git a/test/artefacts/check-uk-visa/afghanistan/transit.html b/test/artefacts/check-uk-visa/afghanistan/transit.html
deleted file mode 100644
index 610b8cb9d1d..00000000000
--- a/test/artefacts/check-uk-visa/afghanistan/transit.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if you need a UK visa - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if you need a UK visa
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/check-uk-visa/y/afghanistan/transit" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Will you pass through UK Border Control?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You might pass through UK Border Control even if you don't leave the airport - eg your bags aren't checked through and you need to collect them before transferring to your outbound flight.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/check-uk-visa">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What’s your nationality as shown on your passport or travel document?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/check-uk-visa/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "What’s your nationality as shown on your passport or travel document?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are you coming to the UK to do?</td>
-    <td class="previous-question-body">
-    Transit (on your way to somewhere else)</td>
-
-  <td class="link-right">
-    <a href="/check-uk-visa/y/afghanistan?previous_response=transit">
-      Change<span class="visuallyhidden"> answer to "What are you coming to the UK to do?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/check-uk-visa/afghanistan/transit.txt b/test/artefacts/check-uk-visa/afghanistan/transit.txt
new file mode 100644
index 00000000000..b1ed360f567
--- /dev/null
+++ b/test/artefacts/check-uk-visa/afghanistan/transit.txt
@@ -0,0 +1,14 @@
+Will you pass through UK Border Control?
+
+
+
+You might pass through UK Border Control even if you don't leave the airport - eg your bags aren't checked through and you need to collect them before transferring to your outbound flight.
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/check-uk-visa/afghanistan/work.html b/test/artefacts/check-uk-visa/afghanistan/work.html
deleted file mode 100644
index ff764d9023e..00000000000
--- a/test/artefacts/check-uk-visa/afghanistan/work.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if you need a UK visa - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if you need a UK visa
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/check-uk-visa/y/afghanistan/work" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How long are you planning to work in the UK for?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="six_months_or_less" />
-        6 months or less
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="longer_than_six_months" />
-        longer than 6 months
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/check-uk-visa">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What’s your nationality as shown on your passport or travel document?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/check-uk-visa/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "What’s your nationality as shown on your passport or travel document?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are you coming to the UK to do?</td>
-    <td class="previous-question-body">
-    Work, academic visit or business</td>
-
-  <td class="link-right">
-    <a href="/check-uk-visa/y/afghanistan?previous_response=work">
-      Change<span class="visuallyhidden"> answer to "What are you coming to the UK to do?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/check-uk-visa/afghanistan/work.txt b/test/artefacts/check-uk-visa/afghanistan/work.txt
new file mode 100644
index 00000000000..dbe798507ce
--- /dev/null
+++ b/test/artefacts/check-uk-visa/afghanistan/work.txt
@@ -0,0 +1,14 @@
+How long are you planning to work in the UK for?
+
+
+
+
+
+  * six_months_or_less: 6 months or less
+  * longer_than_six_months: longer than 6 months
+
+
+
+
+
+
diff --git a/test/artefacts/check-uk-visa/israel.html b/test/artefacts/check-uk-visa/israel.html
deleted file mode 100644
index 8e5064a4e0c..00000000000
--- a/test/artefacts/check-uk-visa/israel.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if you need a UK visa - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if you need a UK visa
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/check-uk-visa/y/israel" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What sort of passport do you have?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="full-passport" />
-        Full passport
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="provisional-passport" />
-        Provisional passport ('travel document in lieu of a national passport')
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/check-uk-visa">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What’s your nationality as shown on your passport or travel document?</td>
-    <td class="previous-question-body">
-    Israel</td>
-
-  <td class="link-right">
-    <a href="/check-uk-visa/y?previous_response=israel">
-      Change<span class="visuallyhidden"> answer to "What’s your nationality as shown on your passport or travel document?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/check-uk-visa/israel.txt b/test/artefacts/check-uk-visa/israel.txt
new file mode 100644
index 00000000000..a2e3c2604c8
--- /dev/null
+++ b/test/artefacts/check-uk-visa/israel.txt
@@ -0,0 +1,14 @@
+What sort of passport do you have?
+
+
+
+
+
+  * full-passport: Full passport
+  * provisional-passport: Provisional passport ('travel document in lieu of a national passport')
+
+
+
+
+
+
diff --git a/test/artefacts/check-uk-visa/y.html b/test/artefacts/check-uk-visa/y.html
deleted file mode 100644
index 212e1b2cb4f..00000000000
--- a/test/artefacts/check-uk-visa/y.html
+++ /dev/null
@@ -1,298 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if you need a UK visa - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if you need a UK visa
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/check-uk-visa/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What’s your nationality as shown on your passport or travel document?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you’re a refugee or don’t have a passport or travel document, select ‘Stateless or refugee’.</p>
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="british-dependent-territories-citizen">British dependent territories citizen</option>
-<option value="british-national-overseas">British national overseas</option>
-<option value="british-overseas-citizen">British overseas citizen</option>
-<option value="british-protected-person">British protected person</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="cyprus-north">Cyprus (northern part of Cyprus)</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hong-kong-(british-national-overseas)">Hong Kong (British national overseas)</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="palestinian-territories">Palestinian Territories</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="stateless-or-refugee">Stateless or Refugee</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="vatican-city">Vatican City</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  5 May 2016</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/check-uk-visa/y.txt b/test/artefacts/check-uk-visa/y.txt
new file mode 100644
index 00000000000..f10193887f7
--- /dev/null
+++ b/test/artefacts/check-uk-visa/y.txt
@@ -0,0 +1,233 @@
+What’s your nationality as shown on your passport or travel document?
+
+
+
+If you’re a refugee or don’t have a passport or travel document, select ‘Stateless or refugee’.
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-virgin-islands: British Virgin Islands
+  * british-dependent-territories-citizen: British dependent territories citizen
+  * british-national-overseas: British national overseas
+  * british-overseas-citizen: British overseas citizen
+  * british-protected-person: British protected person
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * cyprus-north: Cyprus (northern part of Cyprus)
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * greece: Greece
+  * grenada: Grenada
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hong-kong-(british-national-overseas): Hong Kong (British national overseas)
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * palestinian-territories: Palestinian Territories
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * stateless-or-refugee: Stateless or Refugee
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * vatican-city: Vatican City
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no.html b/test/artefacts/childcare-costs-for-tax-credits/no.html
deleted file mode 100644
index b6d1ce9c0c2..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you use childcare?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="regularly_less_than_year" />
-        I’ve been using childcare regularly for less than a year
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="regularly_more_than_year" />
-        I've been using childcare regularly for a year or more
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="only_short_while" />
-        I only use childcare for short periods once in a while
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no.txt b/test/artefacts/childcare-costs-for-tax-credits/no.txt
new file mode 100644
index 00000000000..7a62624f8dc
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no.txt
@@ -0,0 +1,15 @@
+How often do you use childcare?
+
+
+
+
+
+  * regularly_less_than_year: I’ve been using childcare regularly for less than a year
+  * regularly_more_than_year: I've been using childcare regularly for a year or more
+  * only_short_while: I only use childcare for short periods once in a while
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year.html
deleted file mode 100644
index cb4b9143fe8..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_less_than_year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you pay your childcare provider(s)?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly_same_amount" />
-        Weekly, and I always pay the same amount
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="weekly_diff_amount" />
-        Weekly, and the amount I pay varies
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="monthly_same_amount" />
-        Monthly, and I always pay the same amount
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="monthly_diff_amount" />
-        Monthly, and the amount I pay varies
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="other" />
-        Other
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I’ve been using childcare regularly for less than a year</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_less_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year.txt
new file mode 100644
index 00000000000..9a1bbacc5d2
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year.txt
@@ -0,0 +1,17 @@
+How often do you pay your childcare provider(s)?
+
+
+
+
+
+  * weekly_same_amount: Weekly, and I always pay the same amount
+  * weekly_diff_amount: Weekly, and the amount I pay varies
+  * monthly_same_amount: Monthly, and I always pay the same amount
+  * monthly_diff_amount: Monthly, and the amount I pay varies
+  * other: Other
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_diff_amount.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_diff_amount.html
deleted file mode 100644
index 477a7f7fd1f..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_diff_amount.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_less_than_year/monthly_diff_amount" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you expect to pay in total for childcare for the next 12 months?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Add up the amounts you expect to pay in total for the next 12 months - start from the day you’re doing the calculation</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I’ve been using childcare regularly for less than a year</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_less_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Monthly, and the amount I pay varies</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_less_than_year?previous_response=monthly_diff_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_diff_amount.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_diff_amount.txt
new file mode 100644
index 00000000000..d94db616ddc
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_diff_amount.txt
@@ -0,0 +1,12 @@
+How much do you expect to pay in total for childcare for the next 12 months?
+
+
+
+Add up the amounts you expect to pay in total for the next 12 months - start from the day you’re doing the calculation
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_same_amount.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_same_amount.html
deleted file mode 100644
index 5d72aaced6e..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_same_amount.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_less_than_year/monthly_same_amount" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you pay each month?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I’ve been using childcare regularly for less than a year</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_less_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Monthly, and I always pay the same amount</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_less_than_year?previous_response=monthly_same_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_same_amount.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_same_amount.txt
new file mode 100644
index 00000000000..8293177ea7c
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/monthly_same_amount.txt
@@ -0,0 +1,12 @@
+How much do you pay each month?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/weekly_diff_amount.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/weekly_diff_amount.html
deleted file mode 100644
index 927b058efe6..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/weekly_diff_amount.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_less_than_year/weekly_diff_amount" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you expect to pay in total for childcare for the next 52 weeks?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Add up the amounts you expect to pay in total for the next 52 weeks - start from the day you’re doing the calculation</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I’ve been using childcare regularly for less than a year</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_less_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Weekly, and the amount I pay varies</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_less_than_year?previous_response=weekly_diff_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/weekly_diff_amount.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/weekly_diff_amount.txt
new file mode 100644
index 00000000000..5d26317fa32
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_less_than_year/weekly_diff_amount.txt
@@ -0,0 +1,12 @@
+How much do you expect to pay in total for childcare for the next 52 weeks?
+
+
+
+Add up the amounts you expect to pay in total for the next 52 weeks - start from the day you’re doing the calculation
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year.html
deleted file mode 100644
index 6abafefec98..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you pay the same each time?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>Sometimes you may pay - or expect to pay - different amounts for childcare (known as ‘variable costs’), for example:</p>
-
-<ul>
-  <li>you regularly use childcare, but pay more during school holidays than you do at term time</li>
-  <li>the hours you use childcare change from week to week or month to month</li>
-</ul>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I've been using childcare regularly for a year or more</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_more_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year.txt
new file mode 100644
index 00000000000..8bb97035b9e
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year.txt
@@ -0,0 +1,18 @@
+Do you pay the same each time?
+
+Sometimes you may pay - or expect to pay - different amounts for childcare (known as ‘variable costs’), for example:
+
+- you regularly use childcare, but pay more during school holidays than you do at term time
+- the hours you use childcare change from week to week or month to month
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/no.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/no.html
deleted file mode 100644
index 006f39cc159..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/no.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much have you spent on childcare in the last 12 months?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Add up how much you have spent in total over the last 12 months - start backwards from the date you’re doing the calculation.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I've been using childcare regularly for a year or more</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_more_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you pay the same each time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you pay the same each time?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/no.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/no.txt
new file mode 100644
index 00000000000..772af638b5f
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/no.txt
@@ -0,0 +1,12 @@
+How much have you spent on childcare in the last 12 months?
+
+
+
+Add up how much you have spent in total over the last 12 months - start backwards from the date you’re doing the calculation.
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes.html
deleted file mode 100644
index 671ae2fb2e1..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you pay your childcare provider(s)?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly" />
-        Weekly
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="fortnightly" />
-        Fortnightly
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="every_4_weeks" />
-        Every 4 weeks
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="every_month" />
-        Every calendar month
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="termly" />
-        Termly
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="yearly" />
-        Yearly
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="other" />
-        Other
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I've been using childcare regularly for a year or more</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_more_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you pay the same each time?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you pay the same each time?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes.txt
new file mode 100644
index 00000000000..c7c919ef299
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes.txt
@@ -0,0 +1,19 @@
+How often do you pay your childcare provider(s)?
+
+
+
+
+
+  * weekly: Weekly
+  * fortnightly: Fortnightly
+  * every_4_weeks: Every 4 weeks
+  * every_month: Every calendar month
+  * termly: Termly
+  * yearly: Yearly
+  * other: Other
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/every_4_weeks.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/every_4_weeks.html
deleted file mode 100644
index 5b17dd31b7f..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/every_4_weeks.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year/yes/every_4_weeks" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you pay every 4 weeks?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I've been using childcare regularly for a year or more</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_more_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you pay the same each time?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you pay the same each time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Every 4 weeks</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year/yes?previous_response=every_4_weeks">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/every_4_weeks.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/every_4_weeks.txt
new file mode 100644
index 00000000000..42e1ea95292
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/every_4_weeks.txt
@@ -0,0 +1,12 @@
+How much do you pay every 4 weeks?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/fortnightly.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/fortnightly.html
deleted file mode 100644
index 97204dd2a0a..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/fortnightly.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year/yes/fortnightly" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you pay each fortnight?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I've been using childcare regularly for a year or more</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_more_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you pay the same each time?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you pay the same each time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Fortnightly</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year/yes?previous_response=fortnightly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/fortnightly.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/fortnightly.txt
new file mode 100644
index 00000000000..8cb1924da63
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/fortnightly.txt
@@ -0,0 +1,12 @@
+How much do you pay each fortnight?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/yearly.html b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/yearly.html
deleted file mode 100644
index 278837137ce..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/yearly.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year/yes/yearly" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you pay every year?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you use childcare?</td>
-    <td class="previous-question-body">
-    I've been using childcare regularly for a year or more</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no?previous_response=regularly_more_than_year">
-      Change<span class="visuallyhidden"> answer to "How often do you use childcare?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you pay the same each time?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you pay the same each time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Yearly</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/no/regularly_more_than_year/yes?previous_response=yearly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/yearly.txt b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/yearly.txt
new file mode 100644
index 00000000000..cc38e0df4b3
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/no/regularly_more_than_year/yes/yearly.txt
@@ -0,0 +1,12 @@
+How much do you pay every year?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/y.html b/test/artefacts/childcare-costs-for-tax-credits/y.html
deleted file mode 100644
index 689871267d2..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/y.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you currently claiming tax credits for childcare costs?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/y.txt b/test/artefacts/childcare-costs-for-tax-credits/y.txt
new file mode 100644
index 00000000000..9da5ca8f369
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/y.txt
@@ -0,0 +1,14 @@
+Are you currently claiming tax credits for childcare costs?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes.html b/test/artefacts/childcare-costs-for-tax-credits/yes.html
deleted file mode 100644
index 19d49327f27..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/yes.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Have the costs of your childcare changed since you last made your claim?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes.txt b/test/artefacts/childcare-costs-for-tax-credits/yes.txt
new file mode 100644
index 00000000000..cdb9ab98abb
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/yes.txt
@@ -0,0 +1,14 @@
+Have the costs of your childcare changed since you last made your claim?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes.html b/test/artefacts/childcare-costs-for-tax-credits/yes/yes.html
deleted file mode 100644
index 8c3f94ec33d..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/yes/yes.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you pay your childcare provider(s)?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly_same_amount" />
-        Weekly, and I always pay the same amount
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="weekly_diff_amount" />
-        Weekly, and the amount I pay varies
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="monthly_same_amount" />
-        Monthly, and I always pay the same amount
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="monthly_diff_amount" />
-        Monthly, and the amount I pay varies
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="other" />
-        Other
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have the costs of your childcare changed since you last made your claim?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have the costs of your childcare changed since you last made your claim?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes.txt b/test/artefacts/childcare-costs-for-tax-credits/yes/yes.txt
new file mode 100644
index 00000000000..9a1bbacc5d2
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/yes/yes.txt
@@ -0,0 +1,17 @@
+How often do you pay your childcare provider(s)?
+
+
+
+
+
+  * weekly_same_amount: Weekly, and I always pay the same amount
+  * weekly_diff_amount: Weekly, and the amount I pay varies
+  * monthly_same_amount: Monthly, and I always pay the same amount
+  * monthly_diff_amount: Monthly, and the amount I pay varies
+  * other: Other
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_diff_amount.html b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_diff_amount.html
deleted file mode 100644
index 3291932f3e4..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_diff_amount.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/yes/yes/monthly_diff_amount" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you expect to pay in total for childcare for the next 12 months?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have the costs of your childcare changed since you last made your claim?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have the costs of your childcare changed since you last made your claim?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Monthly, and the amount I pay varies</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes?previous_response=monthly_diff_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_diff_amount.txt b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_diff_amount.txt
new file mode 100644
index 00000000000..5271f7112fe
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_diff_amount.txt
@@ -0,0 +1,12 @@
+How much do you expect to pay in total for childcare for the next 12 months?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount.html b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount.html
deleted file mode 100644
index 85408d3dbc8..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/yes/yes/monthly_same_amount" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What's the new monthly cost of your childcare?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have the costs of your childcare changed since you last made your claim?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have the costs of your childcare changed since you last made your claim?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Monthly, and I always pay the same amount</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes?previous_response=monthly_same_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount.txt b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount.txt
new file mode 100644
index 00000000000..94978926688
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount.txt
@@ -0,0 +1,12 @@
+What's the new monthly cost of your childcare?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount/43.3.html b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount/43.3.html
deleted file mode 100644
index a78a9b43917..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount/43.3.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/yes/yes/monthly_same_amount/43.3" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the old average weekly amount you gave the Tax Credit Office?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>If you don’t know what your previous childcare costs were, check your award or renewal notice.</p>
-
-<p>Round the total up to the nearest pound.</p>
-
-
-      </article>
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have the costs of your childcare changed since you last made your claim?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have the costs of your childcare changed since you last made your claim?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Monthly, and I always pay the same amount</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes?previous_response=monthly_same_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's the new monthly cost of your childcare?</td>
-    <td class="previous-question-body">
-    £43.30</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes/monthly_same_amount?previous_response=43.3">
-      Change<span class="visuallyhidden"> answer to "What's the new monthly cost of your childcare?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount/43.3.txt b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount/43.3.txt
new file mode 100644
index 00000000000..4a42edd81a6
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/monthly_same_amount/43.3.txt
@@ -0,0 +1,15 @@
+What was the old average weekly amount you gave the Tax Credit Office?
+
+If you don’t know what your previous childcare costs were, check your award or renewal notice.
+
+Round the total up to the nearest pound.
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount.html b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount.html
deleted file mode 100644
index 3261afc7291..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/yes/yes/weekly_diff_amount" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you expect to pay in total for childcare for the next 52 weeks?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have the costs of your childcare changed since you last made your claim?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have the costs of your childcare changed since you last made your claim?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Weekly, and the amount I pay varies</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes?previous_response=weekly_diff_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount.txt b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount.txt
new file mode 100644
index 00000000000..169ad22b96e
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount.txt
@@ -0,0 +1,12 @@
+How much do you expect to pay in total for childcare for the next 52 weeks?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount/520.html b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount/520.html
deleted file mode 100644
index 95e3022a238..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount/520.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/yes/yes/weekly_diff_amount/520.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the old average weekly amount you gave the Tax Credit Office?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>If you don’t know what your previous childcare costs were, check your award or renewal notice.</p>
-
-<p>Round the total up to the nearest pound.</p>
-
-
-      </article>
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have the costs of your childcare changed since you last made your claim?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have the costs of your childcare changed since you last made your claim?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Weekly, and the amount I pay varies</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes?previous_response=weekly_diff_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you expect to pay in total for childcare for the next 52 weeks?</td>
-    <td class="previous-question-body">
-    £520</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes/weekly_diff_amount?previous_response=520.0">
-      Change<span class="visuallyhidden"> answer to "How much do you expect to pay in total for childcare for the next 52 weeks?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount/520.txt b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount/520.txt
new file mode 100644
index 00000000000..4a42edd81a6
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_diff_amount/520.txt
@@ -0,0 +1,15 @@
+What was the old average weekly amount you gave the Tax Credit Office?
+
+If you don’t know what your previous childcare costs were, check your award or renewal notice.
+
+Round the total up to the nearest pound.
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount.html b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount.html
deleted file mode 100644
index 82fbcb0bd60..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/yes/yes/weekly_same_amount" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What are your new weekly costs?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>Round the total up to the nearest pound.</p>
-
-      </article>
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have the costs of your childcare changed since you last made your claim?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have the costs of your childcare changed since you last made your claim?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Weekly, and I always pay the same amount</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes?previous_response=weekly_same_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount.txt b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount.txt
new file mode 100644
index 00000000000..ec3cdb295e3
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount.txt
@@ -0,0 +1,13 @@
+What are your new weekly costs?
+
+Round the total up to the nearest pound.
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount/10.html b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount/10.html
deleted file mode 100644
index 6afdb83cef6..00000000000
--- a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount/10.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Tax credits: working out your childcare costs - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Tax credits: working out your childcare costs
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/childcare-costs-for-tax-credits/y/yes/yes/weekly_same_amount/10.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the old average weekly amount you gave the Tax Credit Office?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>If you don’t know what your previous childcare costs were, check your award or renewal notice.</p>
-
-<p>Round the total up to the nearest pound.</p>
-
-
-      </article>
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/childcare-costs-for-tax-credits">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently claiming tax credits for childcare costs?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you currently claiming tax credits for childcare costs?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have the costs of your childcare changed since you last made your claim?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have the costs of your childcare changed since you last made your claim?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay your childcare provider(s)?</td>
-    <td class="previous-question-body">
-    Weekly, and I always pay the same amount</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes?previous_response=weekly_same_amount">
-      Change<span class="visuallyhidden"> answer to "How often do you pay your childcare provider(s)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your new weekly costs?</td>
-    <td class="previous-question-body">
-    £10</td>
-
-  <td class="link-right">
-    <a href="/childcare-costs-for-tax-credits/y/yes/yes/weekly_same_amount?previous_response=10.0">
-      Change<span class="visuallyhidden"> answer to "What are your new weekly costs?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount/10.txt b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount/10.txt
new file mode 100644
index 00000000000..4a42edd81a6
--- /dev/null
+++ b/test/artefacts/childcare-costs-for-tax-credits/yes/yes/weekly_same_amount/10.txt
@@ -0,0 +1,15 @@
+What was the old average weekly amount you gave the Tax Credit Office?
+
+If you don’t know what your previous childcare costs were, check your award or renewal notice.
+
+Round the total up to the nearest pound.
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency.html b/test/artefacts/energy-grants-calculator/help_energy_efficiency.html
deleted file mode 100644
index 77741d03f76..00000000000
--- a/test/artefacts/energy-grants-calculator/help_energy_efficiency.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_energy_efficiency" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What are your circumstances?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>Social housing tenants should talk to their social housing provider if they want to improve their energy efficiency.</p>
-
-
-      </article>
-
-      <p class="hint">Choose all that apply to you. If none apply just click ‘Next step’.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="benefits" />
-        You’re getting benefits
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="property" />
-        You own your property
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="permission" />
-        You rent privately but have permission from the owner to install or upgrade the boiler
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help to make your home more energy efficient</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_energy_efficiency">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency.txt b/test/artefacts/energy-grants-calculator/help_energy_efficiency.txt
new file mode 100644
index 00000000000..f7cd0a007ba
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_energy_efficiency.txt
@@ -0,0 +1,16 @@
+What are your circumstances?
+
+Social housing tenants should talk to their social housing provider if they want to improve their energy efficiency.
+
+
+Choose all that apply to you. If none apply just click ‘Next step’.
+
+  * benefits: You’re getting benefits
+  * property: You own your property
+  * permission: You rent privately but have permission from the owner to install or upgrade the boiler
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none.html b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none.html
deleted file mode 100644
index 1f5677052d8..00000000000
--- a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_energy_efficiency/none" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When was your property built?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="on-or-after-1995" />
-        1995 or newer
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="1940s-1984" />
-        1940s – 1994
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="before-1940" />
-        Before 1940
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help to make your home more energy efficient</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_energy_efficiency">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your circumstances?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "What are your circumstances?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none.txt b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none.txt
new file mode 100644
index 00000000000..c6c073837ef
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none.txt
@@ -0,0 +1,15 @@
+When was your property built?
+
+
+
+
+
+  * on-or-after-1995: 1995 or newer
+  * 1940s-1984: 1940s – 1994
+  * before-1940: Before 1940
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/1940s-1984/house.html b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/1940s-1984/house.html
deleted file mode 100644
index 6c6939fc985..00000000000
--- a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/1940s-1984/house.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_energy_efficiency/none/1940s-1984/house" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which  of these do you have:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="mains_gas" />
-        Mains gas
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="electric_heating" />
-        Electric heating
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="modern_double_glazing" />
-        Double glazing (or secondary glazing for listed properties)
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="loft_attic_conversion" />
-        Loft or attic conversion
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="loft_insulation" />
-        Loft insulation
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="solid_wall_insulation" />
-        Solid wall insulation
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="checkbox" name="response[]" id="response_6" value="cavity_wall_insulation" />
-        Cavity wall insulation
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="checkbox" name="response[]" id="response_7" value="modern_boiler" />
-        Modern boiler (less than 10 years)
-      </label>
-    </li>
-    <li>
-      <label for="response_8" class="selectable">
-        <input type="checkbox" name="response[]" id="response_8" value="draught_proofing" />
-        Draught proofing
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help to make your home more energy efficient</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_energy_efficiency">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your circumstances?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "What are your circumstances?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was your property built?</td>
-    <td class="previous-question-body">
-    1940s – 1994</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency/none?previous_response=1940s-1984">
-      Change<span class="visuallyhidden"> answer to "When was your property built?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What kind of property do you live in?</td>
-    <td class="previous-question-body">
-    A house, terraced house or bungalow</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency/none/1940s-1984?previous_response=house">
-      Change<span class="visuallyhidden"> answer to "What kind of property do you live in?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/1940s-1984/house.txt b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/1940s-1984/house.txt
new file mode 100644
index 00000000000..22732b6d5f9
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/1940s-1984/house.txt
@@ -0,0 +1,21 @@
+Which  of these do you have:
+
+
+
+
+
+  * mains_gas: Mains gas
+  * electric_heating: Electric heating
+  * modern_double_glazing: Double glazing (or secondary glazing for listed properties)
+  * loft_attic_conversion: Loft or attic conversion
+  * loft_insulation: Loft insulation
+  * solid_wall_insulation: Solid wall insulation
+  * cavity_wall_insulation: Cavity wall insulation
+  * modern_boiler: Modern boiler (less than 10 years)
+  * draught_proofing: Draught proofing
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/before-1940/house.html b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/before-1940/house.html
deleted file mode 100644
index 73ad0173abc..00000000000
--- a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/before-1940/house.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_energy_efficiency/none/before-1940/house" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which  of these do you have:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="mains_gas" />
-        Mains gas
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="electric_heating" />
-        Electric heating
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="modern_double_glazing" />
-        Double glazing (or secondary glazing for listed properties)
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="loft_attic_conversion" />
-        Loft or attic conversion
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="loft_insulation" />
-        Loft insulation
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="solid_wall_insulation" />
-        Solid wall insulation
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="checkbox" name="response[]" id="response_6" value="modern_boiler" />
-        Modern boiler (less than 10 years)
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="checkbox" name="response[]" id="response_7" value="draught_proofing" />
-        Draught proofing
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help to make your home more energy efficient</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_energy_efficiency">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your circumstances?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "What are your circumstances?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was your property built?</td>
-    <td class="previous-question-body">
-    Before 1940</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency/none?previous_response=before-1940">
-      Change<span class="visuallyhidden"> answer to "When was your property built?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What kind of property do you live in?</td>
-    <td class="previous-question-body">
-    A house, terraced house or bungalow</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency/none/before-1940?previous_response=house">
-      Change<span class="visuallyhidden"> answer to "What kind of property do you live in?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/before-1940/house.txt b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/before-1940/house.txt
new file mode 100644
index 00000000000..d54dd46d00f
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/before-1940/house.txt
@@ -0,0 +1,20 @@
+Which  of these do you have:
+
+
+
+
+
+  * mains_gas: Mains gas
+  * electric_heating: Electric heating
+  * modern_double_glazing: Double glazing (or secondary glazing for listed properties)
+  * loft_attic_conversion: Loft or attic conversion
+  * loft_insulation: Loft insulation
+  * solid_wall_insulation: Solid wall insulation
+  * modern_boiler: Modern boiler (less than 10 years)
+  * draught_proofing: Draught proofing
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995.html b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995.html
deleted file mode 100644
index 50f98a5e21e..00000000000
--- a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_energy_efficiency/none/on-or-after-1995" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What kind of property do you live in?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="house" />
-        A house, terraced house or bungalow
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="flat" />
-        A flat
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help to make your home more energy efficient</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_energy_efficiency">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your circumstances?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "What are your circumstances?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was your property built?</td>
-    <td class="previous-question-body">
-    1995 or newer</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency/none?previous_response=on-or-after-1995">
-      Change<span class="visuallyhidden"> answer to "When was your property built?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995.txt b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995.txt
new file mode 100644
index 00000000000..b56f33587be
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995.txt
@@ -0,0 +1,14 @@
+What kind of property do you live in?
+
+
+
+
+
+  * house: A house, terraced house or bungalow
+  * flat: A flat
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/flat.html b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/flat.html
deleted file mode 100644
index df1d3e3e99d..00000000000
--- a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/flat.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_energy_efficiency/none/on-or-after-1995/flat" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is it a top-floor or a ground-floor flat?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="top_floor" />
-        Top-floor
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="ground_floor" />
-        Ground-floor
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help to make your home more energy efficient</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_energy_efficiency">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your circumstances?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "What are your circumstances?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was your property built?</td>
-    <td class="previous-question-body">
-    1995 or newer</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency/none?previous_response=on-or-after-1995">
-      Change<span class="visuallyhidden"> answer to "When was your property built?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What kind of property do you live in?</td>
-    <td class="previous-question-body">
-    A flat</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency/none/on-or-after-1995?previous_response=flat">
-      Change<span class="visuallyhidden"> answer to "What kind of property do you live in?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/flat.txt b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/flat.txt
new file mode 100644
index 00000000000..17b525a8e39
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/flat.txt
@@ -0,0 +1,14 @@
+Is it a top-floor or a ground-floor flat?
+
+
+
+
+
+  * top_floor: Top-floor
+  * ground_floor: Ground-floor
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/house.html b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/house.html
deleted file mode 100644
index 6bb9e1da9f9..00000000000
--- a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/house.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_energy_efficiency/none/on-or-after-1995/house" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which  of these do you have:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="mains_gas" />
-        Mains gas
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="electric_heating" />
-        Electric heating
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="loft_attic_conversion" />
-        Loft or attic conversion
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="draught_proofing" />
-        Draught proofing
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help to make your home more energy efficient</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_energy_efficiency">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your circumstances?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "What are your circumstances?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was your property built?</td>
-    <td class="previous-question-body">
-    1995 or newer</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency/none?previous_response=on-or-after-1995">
-      Change<span class="visuallyhidden"> answer to "When was your property built?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What kind of property do you live in?</td>
-    <td class="previous-question-body">
-    A house, terraced house or bungalow</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_energy_efficiency/none/on-or-after-1995?previous_response=house">
-      Change<span class="visuallyhidden"> answer to "What kind of property do you live in?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/house.txt b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/house.txt
new file mode 100644
index 00000000000..4213905df01
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_energy_efficiency/none/on-or-after-1995/house.txt
@@ -0,0 +1,16 @@
+Which  of these do you have:
+
+
+
+
+
+  * mains_gas: Mains gas
+  * electric_heating: Electric heating
+  * loft_attic_conversion: Loft or attic conversion
+  * draught_proofing: Draught proofing
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_with_fuel_bill.html b/test/artefacts/energy-grants-calculator/help_with_fuel_bill.html
deleted file mode 100644
index 82ddfc4d9f7..00000000000
--- a/test/artefacts/energy-grants-calculator/help_with_fuel_bill.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_with_fuel_bill" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What are your circumstances?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Choose all that apply to you. If none apply just click ‘Next step’.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="benefits" />
-        You’re getting benefits
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="property" />
-        You own your property
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="permission" />
-        You rent privately but have permission from the owner to make energy saving improvements (eg upgrade the boiler)
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="social_housing" />
-        You’re a social housing tenant
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help with your fuel bill</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_with_fuel_bill">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_with_fuel_bill.txt b/test/artefacts/energy-grants-calculator/help_with_fuel_bill.txt
new file mode 100644
index 00000000000..f1a9d23a301
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_with_fuel_bill.txt
@@ -0,0 +1,16 @@
+What are your circumstances?
+
+
+
+Choose all that apply to you. If none apply just click ‘Next step’.
+
+  * benefits: You’re getting benefits
+  * property: You own your property
+  * permission: You rent privately but have permission from the owner to make energy saving improvements (eg upgrade the boiler)
+  * social_housing: You’re a social housing tenant
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01.html b/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01.html
deleted file mode 100644
index 4dfb1360204..00000000000
--- a/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_with_fuel_bill/benefits,property/1950-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which of these benefits do you get?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Choose all that apply to you. If none apply just click ‘Next step’.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="pension_credit" />
-        Pension Credit
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="income_support" />
-        Income Support
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="jsa" />
-        Income based Jobseeker’s Allowance
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="esa" />
-        Income-related Employment and Support Allowance (ESA)
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="child_tax_credit" />
-        Child Tax Credit - only if your income is £16,010 or less
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="working_tax_credit" />
-        Working Tax Credit - only if your income is £16,010 or less
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="checkbox" name="response[]" id="response_6" value="universal_credit" />
-        Universal Credit (and you earned £1,250 or less after tax in any assessment period in the last 12 months)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help with your fuel bill</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_with_fuel_bill">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your circumstances?</td>
-    <td class="previous-question-body"><ul>
-      <li>You’re getting benefits</li>
-      <li>You own your property</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_with_fuel_bill?previous_response=benefits%2Cproperty">
-      Change<span class="visuallyhidden"> answer to "What are your circumstances?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s your date of birth?</td>
-    <td class="previous-question-body">
-     1 January 1950</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_with_fuel_bill/benefits,property?previous_response=1950-01-01">
-      Change<span class="visuallyhidden"> answer to "What’s your date of birth?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01.txt b/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01.txt
new file mode 100644
index 00000000000..9d6bc4aabce
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01.txt
@@ -0,0 +1,19 @@
+Which of these benefits do you get?
+
+
+
+Choose all that apply to you. If none apply just click ‘Next step’.
+
+  * pension_credit: Pension Credit
+  * income_support: Income Support
+  * jsa: Income based Jobseeker’s Allowance
+  * esa: Income-related Employment and Support Allowance (ESA)
+  * child_tax_credit: Child Tax Credit - only if your income is £16,010 or less
+  * working_tax_credit: Working Tax Credit - only if your income is £16,010 or less
+  * universal_credit: Universal Credit (and you earned £1,250 or less after tax in any assessment period in the last 12 months)
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01/pension_credit,income_support,jsa,esa,child_tax_credit,working_tax_credit.html b/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01/pension_credit,income_support,jsa,esa,child_tax_credit,working_tax_credit.html
deleted file mode 100644
index 70d1346f9b4..00000000000
--- a/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01/pension_credit,income_support,jsa,esa,child_tax_credit,working_tax_credit.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_with_fuel_bill/benefits,property/1950-01-01/child_tax_credit,esa,income_support,jsa,pension_credit,working_tax_credit" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you elderly, disabled, or do you have children?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Choose all that apply to you. If none apply just click ‘Next step’.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="disabled" />
-        You or your partner are disabled.
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="disabled_child" />
-        You have a disabled child.
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="child_under_5" />
-        You have a child under 5.
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="child_under_16" />
-        You have a child under 16 or under 20 if in full-time education.
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="pensioner_premium" />
-        You (or your partner) get a ‘pensioner premium’.
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="work_support_esa" />
-        You’re in the work-related or support group of ESA.
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help with your fuel bill</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_with_fuel_bill">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your circumstances?</td>
-    <td class="previous-question-body"><ul>
-      <li>You’re getting benefits</li>
-      <li>You own your property</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_with_fuel_bill?previous_response=benefits%2Cproperty">
-      Change<span class="visuallyhidden"> answer to "What are your circumstances?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s your date of birth?</td>
-    <td class="previous-question-body">
-     1 January 1950</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_with_fuel_bill/benefits,property?previous_response=1950-01-01">
-      Change<span class="visuallyhidden"> answer to "What’s your date of birth?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which of these benefits do you get?</td>
-    <td class="previous-question-body"><ul>
-      <li>Child Tax Credit - only if your income is £16,010 or less</li>
-      <li>Income-related Employment and Support Allowance (ESA)</li>
-      <li>Income Support</li>
-      <li>Income based Jobseeker’s Allowance</li>
-      <li>Pension Credit</li>
-      <li>Working Tax Credit - only if your income is £16,010 or less</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_with_fuel_bill/benefits,property/1950-01-01?previous_response=child_tax_credit%2Cesa%2Cincome_support%2Cjsa%2Cpension_credit%2Cworking_tax_credit">
-      Change<span class="visuallyhidden"> answer to "Which of these benefits do you get?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01/pension_credit,income_support,jsa,esa,child_tax_credit,working_tax_credit.txt b/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01/pension_credit,income_support,jsa,esa,child_tax_credit,working_tax_credit.txt
new file mode 100644
index 00000000000..1e220676d6e
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_with_fuel_bill/benefits,property/1950-01-01/pension_credit,income_support,jsa,esa,child_tax_credit,working_tax_credit.txt
@@ -0,0 +1,18 @@
+Are you elderly, disabled, or do you have children?
+
+
+
+Choose all that apply to you. If none apply just click ‘Next step’.
+
+  * disabled: You or your partner are disabled.
+  * disabled_child: You have a disabled child.
+  * child_under_5: You have a child under 5.
+  * child_under_16: You have a child under 16 or under 20 if in full-time education.
+  * pensioner_premium: You (or your partner) get a ‘pensioner premium’.
+  * work_support_esa: You’re in the work-related or support group of ESA.
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/help_with_fuel_bill/none.html b/test/artefacts/energy-grants-calculator/help_with_fuel_bill/none.html
deleted file mode 100644
index 3dfbbbce408..00000000000
--- a/test/artefacts/energy-grants-calculator/help_with_fuel_bill/none.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y/help_with_fuel_bill/none" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What’s your date of birth?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="1893">1893</option>
-<option value="1894">1894</option>
-<option value="1895">1895</option>
-<option value="1896">1896</option>
-<option value="1897">1897</option>
-<option value="1898">1898</option>
-<option value="1899">1899</option>
-<option value="1900">1900</option>
-<option value="1901">1901</option>
-<option value="1902">1902</option>
-<option value="1903">1903</option>
-<option value="1904">1904</option>
-<option value="1905">1905</option>
-<option value="1906">1906</option>
-<option value="1907">1907</option>
-<option value="1908">1908</option>
-<option value="1909">1909</option>
-<option value="1910">1910</option>
-<option value="1911">1911</option>
-<option value="1912">1912</option>
-<option value="1913">1913</option>
-<option value="1914">1914</option>
-<option value="1915">1915</option>
-<option value="1916">1916</option>
-<option value="1917">1917</option>
-<option value="1918">1918</option>
-<option value="1919">1919</option>
-<option value="1920">1920</option>
-<option value="1921">1921</option>
-<option value="1922">1922</option>
-<option value="1923">1923</option>
-<option value="1924">1924</option>
-<option value="1925">1925</option>
-<option value="1926">1926</option>
-<option value="1927">1927</option>
-<option value="1928">1928</option>
-<option value="1929">1929</option>
-<option value="1930">1930</option>
-<option value="1931">1931</option>
-<option value="1932">1932</option>
-<option value="1933">1933</option>
-<option value="1934">1934</option>
-<option value="1935">1935</option>
-<option value="1936">1936</option>
-<option value="1937">1937</option>
-<option value="1938">1938</option>
-<option value="1939">1939</option>
-<option value="1940">1940</option>
-<option value="1941">1941</option>
-<option value="1942">1942</option>
-<option value="1943">1943</option>
-<option value="1944">1944</option>
-<option value="1945">1945</option>
-<option value="1946">1946</option>
-<option value="1947">1947</option>
-<option value="1948">1948</option>
-<option value="1949">1949</option>
-<option value="1950">1950</option>
-<option value="1951">1951</option>
-<option value="1952">1952</option>
-<option value="1953">1953</option>
-<option value="1954">1954</option>
-<option value="1955">1955</option>
-<option value="1956">1956</option>
-<option value="1957">1957</option>
-<option value="1958">1958</option>
-<option value="1959">1959</option>
-<option value="1960">1960</option>
-<option value="1961">1961</option>
-<option value="1962">1962</option>
-<option value="1963">1963</option>
-<option value="1964">1964</option>
-<option value="1965">1965</option>
-<option value="1966">1966</option>
-<option value="1967">1967</option>
-<option value="1968">1968</option>
-<option value="1969">1969</option>
-<option value="1970">1970</option>
-<option value="1971">1971</option>
-<option value="1972">1972</option>
-<option value="1973">1973</option>
-<option value="1974">1974</option>
-<option value="1975">1975</option>
-<option value="1976">1976</option>
-<option value="1977">1977</option>
-<option value="1978">1978</option>
-<option value="1979">1979</option>
-<option value="1980">1980</option>
-<option value="1981">1981</option>
-<option value="1982">1982</option>
-<option value="1983">1983</option>
-<option value="1984">1984</option>
-<option value="1985">1985</option>
-<option value="1986">1986</option>
-<option value="1987">1987</option>
-<option value="1988">1988</option>
-<option value="1989">1989</option>
-<option value="1990">1990</option>
-<option value="1991">1991</option>
-<option value="1992">1992</option>
-<option value="1993">1993</option>
-<option value="1994">1994</option>
-<option value="1995">1995</option>
-<option value="1996">1996</option>
-<option value="1997">1997</option>
-<option value="1998">1998</option>
-<option value="1999">1999</option>
-<option value="2000">2000</option>
-<option value="2001">2001</option>
-<option value="2002">2002</option>
-<option value="2003">2003</option>
-<option value="2004">2004</option>
-<option value="2005">2005</option>
-<option value="2006">2006</option>
-<option value="2007">2007</option>
-<option value="2008">2008</option>
-<option value="2009">2009</option>
-<option value="2010">2010</option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/energy-grants-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you looking for:</td>
-    <td class="previous-question-body">
-    Help with your fuel bill</td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y?previous_response=help_with_fuel_bill">
-      Change<span class="visuallyhidden"> answer to "Are you looking for:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What are your circumstances?</td>
-    <td class="previous-question-body"><ul>
-      <li>none</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/energy-grants-calculator/y/help_with_fuel_bill?previous_response=none">
-      Change<span class="visuallyhidden"> answer to "What are your circumstances?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/help_with_fuel_bill/none.txt b/test/artefacts/energy-grants-calculator/help_with_fuel_bill/none.txt
new file mode 100644
index 00000000000..094e4d7d422
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/help_with_fuel_bill/none.txt
@@ -0,0 +1,12 @@
+What’s your date of birth?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/energy-grants-calculator/y.html b/test/artefacts/energy-grants-calculator/y.html
deleted file mode 100644
index 69745771477..00000000000
--- a/test/artefacts/energy-grants-calculator/y.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Find energy grants and ways to improve your energy efficiency - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Find energy grants and ways to improve your energy efficiency
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/energy-grants-calculator/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you looking for:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="help_with_fuel_bill" />
-        Help with your fuel bill
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="help_energy_efficiency" />
-        Help to make your home more energy efficient
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="help_boiler_measure" />
-        Help with a new boiler, insulation or other improvements
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="all_help" />
-        All of the above
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/energy-grants-calculator/y.txt b/test/artefacts/energy-grants-calculator/y.txt
new file mode 100644
index 00000000000..9067c9da56e
--- /dev/null
+++ b/test/artefacts/energy-grants-calculator/y.txt
@@ -0,0 +1,16 @@
+Are you looking for:
+
+
+
+
+
+  * help_with_fuel_bill: Help with your fuel bill
+  * help_energy_efficiency: Help to make your home more energy efficient
+  * help_boiler_measure: Help with a new boiler, insulation or other improvements
+  * all_help: All of the above
+
+
+
+
+
+
diff --git a/test/artefacts/estimate-self-assessment-penalties/2011-12.html b/test/artefacts/estimate-self-assessment-penalties/2011-12.html
deleted file mode 100644
index d197883dd95..00000000000
--- a/test/artefacts/estimate-self-assessment-penalties/2011-12.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Estimate your penalty for late Self Assessment tax returns and payments - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Estimate your penalty for late Self Assessment tax returns and payments
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/estimate-self-assessment-penalties/y/2011-12" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How did you send your Self Assessment tax return?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="online" />
-        Online
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="paper" />
-        On paper
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/estimate-self-assessment-penalties">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">For which tax year do you want the estimate?</td>
-    <td class="previous-question-body">
-    6 April 2011 to 5 April 2012</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y?previous_response=2011-12">
-      Change<span class="visuallyhidden"> answer to "For which tax year do you want the estimate?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/estimate-self-assessment-penalties/2011-12.txt b/test/artefacts/estimate-self-assessment-penalties/2011-12.txt
new file mode 100644
index 00000000000..6a6c19303dd
--- /dev/null
+++ b/test/artefacts/estimate-self-assessment-penalties/2011-12.txt
@@ -0,0 +1,14 @@
+How did you send your Self Assessment tax return?
+
+
+
+
+
+  * online: Online
+  * paper: On paper
+
+
+
+
+
+
diff --git a/test/artefacts/estimate-self-assessment-penalties/2011-12/online.html b/test/artefacts/estimate-self-assessment-penalties/2011-12/online.html
deleted file mode 100644
index 89e8e6be043..00000000000
--- a/test/artefacts/estimate-self-assessment-penalties/2011-12/online.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Estimate your penalty for late Self Assessment tax returns and payments - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Estimate your penalty for late Self Assessment tax returns and payments
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/estimate-self-assessment-penalties/y/2011-12/online" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When did you send your Self Assessment tax return?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you sent it online, enter the date you submitted the return. If you sent it on paper, add 2 days to the date you posted it. If you haven’t sent it yet, enter the date you expect to send it.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/estimate-self-assessment-penalties">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">For which tax year do you want the estimate?</td>
-    <td class="previous-question-body">
-    6 April 2011 to 5 April 2012</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y?previous_response=2011-12">
-      Change<span class="visuallyhidden"> answer to "For which tax year do you want the estimate?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How did you send your Self Assessment tax return?</td>
-    <td class="previous-question-body">
-    Online</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y/2011-12?previous_response=online">
-      Change<span class="visuallyhidden"> answer to "How did you send your Self Assessment tax return?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/estimate-self-assessment-penalties/2011-12/online.txt b/test/artefacts/estimate-self-assessment-penalties/2011-12/online.txt
new file mode 100644
index 00000000000..f23279b3a34
--- /dev/null
+++ b/test/artefacts/estimate-self-assessment-penalties/2011-12/online.txt
@@ -0,0 +1,12 @@
+When did you send your Self Assessment tax return?
+
+
+
+If you sent it online, enter the date you submitted the return. If you sent it on paper, add 2 days to the date you posted it. If you haven’t sent it yet, enter the date you expect to send it.
+
+
+
+
+
+
+
diff --git a/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07.html b/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07.html
deleted file mode 100644
index ea02f2ce91f..00000000000
--- a/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Estimate your penalty for late Self Assessment tax returns and payments - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Estimate your penalty for late Self Assessment tax returns and payments
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/estimate-self-assessment-penalties/y/2011-12/online/2012-04-07" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When did you pay the bill?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you haven’t paid yet, enter the date you expect HM Revenue &amp; Customs to get your payment</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/estimate-self-assessment-penalties">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">For which tax year do you want the estimate?</td>
-    <td class="previous-question-body">
-    6 April 2011 to 5 April 2012</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y?previous_response=2011-12">
-      Change<span class="visuallyhidden"> answer to "For which tax year do you want the estimate?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How did you send your Self Assessment tax return?</td>
-    <td class="previous-question-body">
-    Online</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y/2011-12?previous_response=online">
-      Change<span class="visuallyhidden"> answer to "How did you send your Self Assessment tax return?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When did you send your Self Assessment tax return?</td>
-    <td class="previous-question-body">
-     7 April 2012</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y/2011-12/online?previous_response=2012-04-07">
-      Change<span class="visuallyhidden"> answer to "When did you send your Self Assessment tax return?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07.txt b/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07.txt
new file mode 100644
index 00000000000..faebc25f16a
--- /dev/null
+++ b/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07.txt
@@ -0,0 +1,12 @@
+When did you pay the bill?
+
+
+
+If you haven’t paid yet, enter the date you expect HM Revenue &amp; Customs to get your payment
+
+
+
+
+
+
+
diff --git a/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07/2013-03-02.html b/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07/2013-03-02.html
deleted file mode 100644
index a7320568524..00000000000
--- a/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07/2013-03-02.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Estimate your penalty for late Self Assessment tax returns and payments - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Estimate your penalty for late Self Assessment tax returns and payments
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/estimate-self-assessment-penalties/y/2011-12/online/2012-04-07/2013-03-02" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Please enter how much your tax bill is (or an estimate if you don’t know)
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This calculator is anonymous. None of your details will be passed to HMRC.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />for the tax year</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/estimate-self-assessment-penalties">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">For which tax year do you want the estimate?</td>
-    <td class="previous-question-body">
-    6 April 2011 to 5 April 2012</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y?previous_response=2011-12">
-      Change<span class="visuallyhidden"> answer to "For which tax year do you want the estimate?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How did you send your Self Assessment tax return?</td>
-    <td class="previous-question-body">
-    Online</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y/2011-12?previous_response=online">
-      Change<span class="visuallyhidden"> answer to "How did you send your Self Assessment tax return?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When did you send your Self Assessment tax return?</td>
-    <td class="previous-question-body">
-     7 April 2012</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y/2011-12/online?previous_response=2012-04-07">
-      Change<span class="visuallyhidden"> answer to "When did you send your Self Assessment tax return?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When did you pay the bill?</td>
-    <td class="previous-question-body">
-     2 March 2013</td>
-
-  <td class="link-right">
-    <a href="/estimate-self-assessment-penalties/y/2011-12/online/2012-04-07?previous_response=2013-03-02">
-      Change<span class="visuallyhidden"> answer to "When did you pay the bill?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07/2013-03-02.txt b/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07/2013-03-02.txt
new file mode 100644
index 00000000000..92c2dd57fd5
--- /dev/null
+++ b/test/artefacts/estimate-self-assessment-penalties/2011-12/online/2012-04-07/2013-03-02.txt
@@ -0,0 +1,12 @@
+Please enter how much your tax bill is (or an estimate if you don’t know)
+
+
+
+This calculator is anonymous. None of your details will be passed to HMRC.
+
+
+
+
+for the tax year
+
+
diff --git a/test/artefacts/estimate-self-assessment-penalties/y.html b/test/artefacts/estimate-self-assessment-penalties/y.html
deleted file mode 100644
index 4b7b2f91556..00000000000
--- a/test/artefacts/estimate-self-assessment-penalties/y.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Estimate your penalty for late Self Assessment tax returns and payments - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Estimate your penalty for late Self Assessment tax returns and payments
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/estimate-self-assessment-penalties/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    For which tax year do you want the estimate?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="2011-12" />
-        6 April 2011 to 5 April 2012
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="2012-13" />
-        6 April 2012 to 5 April 2013
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="2013-14" />
-        6 April 2013 to 5 April 2014
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="2014-15" />
-        6 April 2014 to 5 April 2015
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/estimate-self-assessment-penalties/y.txt b/test/artefacts/estimate-self-assessment-penalties/y.txt
new file mode 100644
index 00000000000..e600ca9aecf
--- /dev/null
+++ b/test/artefacts/estimate-self-assessment-penalties/y.txt
@@ -0,0 +1,16 @@
+For which tax year do you want the estimate?
+
+
+
+
+
+  * 2011-12: 6 April 2011 to 5 April 2012
+  * 2012-13: 6 April 2012 to 5 April 2013
+  * 2013-14: 6 April 2013 to 5 April 2014
+  * 2014-15: 6 April 2014 to 5 April 2015
+
+
+
+
+
+
diff --git a/test/artefacts/help-if-you-are-arrested-abroad/y.html b/test/artefacts/help-if-you-are-arrested-abroad/y.html
deleted file mode 100644
index 0b50520e956..00000000000
--- a/test/artefacts/help-if-you-are-arrested-abroad/y.html
+++ /dev/null
@@ -1,302 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Help if you're arrested abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Help if you're arrested abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/help-if-you-are-arrested-abroad/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which country?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-guiana">French Guiana</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guadeloupe">Guadeloupe</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="martinique">Martinique</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mayotte">Mayotte</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="reunion">Reunion</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="the-occupied-palestinian-territories">The Occupied Palestinian Territories</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/help-if-you-are-arrested-abroad/y.txt b/test/artefacts/help-if-you-are-arrested-abroad/y.txt
new file mode 100644
index 00000000000..f2b69ba900c
--- /dev/null
+++ b/test/artefacts/help-if-you-are-arrested-abroad/y.txt
@@ -0,0 +1,238 @@
+Which country?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-guiana: French Guiana
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guadeloupe: Guadeloupe
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * martinique: Martinique
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mayotte: Mayotte
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * reunion: Reunion
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * the-occupied-palestinian-territories: The Occupied Palestinian Territories
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales.html b/test/artefacts/inherits-someone-dies-without-will/england-and-wales.html
deleted file mode 100644
index 5bceb6c491d..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/england-and-wales.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/england-and-wales" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is there a living husband, wife or civil partner?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">A surviving partner who wasn't married or in a civil partnership with the deceased has no automatic right to inherit.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    England and Wales</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=england-and-wales">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales.txt b/test/artefacts/inherits-someone-dies-without-will/england-and-wales.txt
new file mode 100644
index 00000000000..b5f09309c70
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/england-and-wales.txt
@@ -0,0 +1,14 @@
+Is there a living husband, wife or civil partner?
+
+
+
+A surviving partner who wasn't married or in a civil partnership with the deceased has no automatic right to inherit.
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no.html b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no.html
deleted file mode 100644
index b2173cce35d..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/england-and-wales/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are there any living parents?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    England and Wales</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=england-and-wales">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no.txt b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no.txt
new file mode 100644
index 00000000000..faae92681ff
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no.txt
@@ -0,0 +1,14 @@
+Are there any living parents?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no.html b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no.html
deleted file mode 100644
index ef296ce699d..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the deceased have any brothers or sisters?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    England and Wales</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=england-and-wales">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living parents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living parents?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no.txt b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no.txt
new file mode 100644
index 00000000000..0abac0cdef2
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no.txt
@@ -0,0 +1,14 @@
+Did the deceased have any brothers or sisters?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no.html b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no.html
deleted file mode 100644
index 523c683cd1b..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the deceased have any half-brothers or half-sisters?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    England and Wales</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=england-and-wales">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living parents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living parents?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any brothers or sisters?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any brothers or sisters?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no.txt b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no.txt
new file mode 100644
index 00000000000..6af4f22557c
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no.txt
@@ -0,0 +1,14 @@
+Did the deceased have any half-brothers or half-sisters?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no.html b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no.html
deleted file mode 100644
index 2827edc5dc2..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are there any living grandparents?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    England and Wales</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=england-and-wales">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living parents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living parents?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any brothers or sisters?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any brothers or sisters?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any half-brothers or half-sisters?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any half-brothers or half-sisters?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no.txt b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no.txt
new file mode 100644
index 00000000000..e742d2e2f2b
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no.txt
@@ -0,0 +1,14 @@
+Are there any living grandparents?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no.html b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no.html
deleted file mode 100644
index ce773b1c818..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the deceased have any aunts or uncles?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    England and Wales</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=england-and-wales">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living parents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living parents?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any brothers or sisters?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any brothers or sisters?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any half-brothers or half-sisters?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any half-brothers or half-sisters?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living grandparents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living grandparents?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no.txt b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no.txt
new file mode 100644
index 00000000000..f68cef2ab80
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no.txt
@@ -0,0 +1,14 @@
+Did the deceased have any aunts or uncles?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no/no.html b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no/no.html
deleted file mode 100644
index 190f7a7dca6..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no/no.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the deceased have any half-aunts or half-uncles?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    England and Wales</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=england-and-wales">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living parents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living parents?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any brothers or sisters?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any brothers or sisters?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any half-brothers or half-sisters?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any half-brothers or half-sisters?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living grandparents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living grandparents?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any aunts or uncles?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/no/no/no/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any aunts or uncles?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no/no.txt b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no/no.txt
new file mode 100644
index 00000000000..c7b52072c25
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/no/no/no/no/no/no/no.txt
@@ -0,0 +1,14 @@
+Did the deceased have any half-aunts or half-uncles?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes.html b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes.html
deleted file mode 100644
index 71cd0ea1c17..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/england-and-wales/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the estate likely to be worth more than £250,000?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    England and Wales</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=england-and-wales">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes.txt b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes.txt
new file mode 100644
index 00000000000..c395f2c82e1
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes.txt
@@ -0,0 +1,14 @@
+Is the estate likely to be worth more than £250,000?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes/yes.html b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes/yes.html
deleted file mode 100644
index eea3369ea7e..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes/yes.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/england-and-wales/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Children include legally-adopted sons or daughters (but not stepchildren) and any children where the deceased had a parental role.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    England and Wales</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=england-and-wales">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the estate likely to be worth more than £250,000?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/england-and-wales/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the estate likely to be worth more than £250,000?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes/yes.txt b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes/yes.txt
new file mode 100644
index 00000000000..d75a90257ff
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/england-and-wales/yes/yes.txt
@@ -0,0 +1,14 @@
+Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?
+
+
+
+Children include legally-adopted sons or daughters (but not stepchildren) and any children where the deceased had a parental role.
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/no/no.html b/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/no/no.html
deleted file mode 100644
index 13639905d5f..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/no/no.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/northern-ireland/yes/yes/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the deceased have any brothers or sisters?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    Northern Ireland</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=northern-ireland">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/northern-ireland?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the estate likely to be worth more than £250,000?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/northern-ireland/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the estate likely to be worth more than £250,000?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/northern-ireland/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living parents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/northern-ireland/yes/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living parents?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/no/no.txt b/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/no/no.txt
new file mode 100644
index 00000000000..0abac0cdef2
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/no/no.txt
@@ -0,0 +1,14 @@
+Did the deceased have any brothers or sisters?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/yes.html b/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/yes.html
deleted file mode 100644
index ae46710e7bb..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/yes.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/northern-ireland/yes/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did they have more than one child?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    Northern Ireland</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=northern-ireland">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/northern-ireland?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the estate likely to be worth more than £250,000?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/northern-ireland/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the estate likely to be worth more than £250,000?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/northern-ireland/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/yes.txt b/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/yes.txt
new file mode 100644
index 00000000000..2a430325242
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/northern-ireland/yes/yes/yes.txt
@@ -0,0 +1,14 @@
+Did they have more than one child?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/scotland/no/no/no/no/no/no.html b/test/artefacts/inherits-someone-dies-without-will/scotland/no/no/no/no/no/no.html
deleted file mode 100644
index 2a9822738cc..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/scotland/no/no/no/no/no/no.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y/scotland/no/no/no/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are there any living great aunts or great uncles?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Great aunts and great uncles are brothers or sisters of the grandparents of the deceased.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/inherits-someone-dies-without-will">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the deceased live?</td>
-    <td class="previous-question-body">
-    Scotland</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y?previous_response=scotland">
-      Change<span class="visuallyhidden"> answer to "Where did the deceased live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is there a living husband, wife or civil partner?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/scotland?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is there a living husband, wife or civil partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/scotland/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living parents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/scotland/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living parents?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any brothers or sisters?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/scotland/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any brothers or sisters?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the deceased have any aunts or uncles?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/scotland/no/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did the deceased have any aunts or uncles?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are there any living grandparents?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/inherits-someone-dies-without-will/y/scotland/no/no/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are there any living grandparents?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/scotland/no/no/no/no/no/no.txt b/test/artefacts/inherits-someone-dies-without-will/scotland/no/no/no/no/no/no.txt
new file mode 100644
index 00000000000..e5daa435875
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/scotland/no/no/no/no/no/no.txt
@@ -0,0 +1,14 @@
+Are there any living great aunts or great uncles?
+
+
+
+Great aunts and great uncles are brothers or sisters of the grandparents of the deceased.
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/inherits-someone-dies-without-will/y.html b/test/artefacts/inherits-someone-dies-without-will/y.html
deleted file mode 100644
index e628f493f41..00000000000
--- a/test/artefacts/inherits-someone-dies-without-will/y.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Intestacy - who inherits if someone dies without a will? - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Intestacy - who inherits if someone dies without a will?
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/inherits-someone-dies-without-will/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Where did the deceased live?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="england-and-wales" />
-        England and Wales
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="scotland" />
-        Scotland
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="northern-ireland" />
-        Northern Ireland
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/inherits-someone-dies-without-will/y.txt b/test/artefacts/inherits-someone-dies-without-will/y.txt
new file mode 100644
index 00000000000..cbbf9a96e33
--- /dev/null
+++ b/test/artefacts/inherits-someone-dies-without-will/y.txt
@@ -0,0 +1,15 @@
+Where did the deceased live?
+
+
+
+
+
+  * england-and-wales: England and Wales
+  * scotland: Scotland
+  * northern-ireland: Northern Ireland
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW.html b/test/artefacts/landlord-immigration-check/B1 1PW.html
deleted file mode 100644
index d1287542724..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW.html	
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the person renting the property as their main home?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>This includes:</p>
-
-<ul>
-  <li>tenancy agreement</li>
-  <li>a lease</li>
-  <li>a licence</li>
-  <li>sub-lease or sub-tenancy</li>
-  <li>lodgers</li>
-  <li>house guests or family members who pay rent</li>
-</ul>
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW.txt b/test/artefacts/landlord-immigration-check/B1 1PW.txt
new file mode 100644
index 00000000000..d51a8f56d93
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW.txt	
@@ -0,0 +1,22 @@
+Is the person renting the property as their main home?
+
+This includes:
+
+- tenancy agreement
+- a lease
+- a licence
+- sub-lease or sub-tenancy
+- lodgers
+- house guests or family members who pay rent
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/no.html b/test/artefacts/landlord-immigration-check/B1 1PW/no.html
deleted file mode 100644
index cb586d08c41..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/no.html	
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What kind of property are you letting?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="holiday_accommodation" />
-        holiday accommodation
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="social_housing" />
-        social housing
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="care_home" />
-        a care home or hospice
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="hostel_or_refuge" />
-        a hostel or refuge
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="mobile_home" />
-        a mobile home
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="employee_accommodation" />
-        accommodation to an employee or as part of training, eg tied accommodation
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="student_accommodation" />
-        student accommodation
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="radio" name="response" id="response_7" value="7_year_lease_property" />
-        a residential property with a lease for 7 years or more
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/no.txt b/test/artefacts/landlord-immigration-check/B1 1PW/no.txt
new file mode 100644
index 00000000000..58b43412093
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/no.txt	
@@ -0,0 +1,20 @@
+What kind of property are you letting?
+
+
+
+
+
+  * holiday_accommodation: holiday accommodation
+  * social_housing: social housing
+  * care_home: a care home or hospice
+  * hostel_or_refuge: a hostel or refuge
+  * mobile_home: a mobile home
+  * employee_accommodation: accommodation to an employee or as part of training, eg tied accommodation
+  * student_accommodation: student accommodation
+  * 7_year_lease_property: a residential property with a lease for 7 years or more
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes.html
deleted file mode 100644
index d005e67c09d..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes.html	
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the person at least 18 years of age?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes.txt
new file mode 100644
index 00000000000..b4193e726c0
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes.txt	
@@ -0,0 +1,14 @@
+Is the person at least 18 years of age?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes.html
deleted file mode 100644
index ccdbcc6e4b5..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes.html	
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>A named person is someone who appears on someone else’s passport.</p>
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes.txt
new file mode 100644
index 00000000000..28acd2c1e13
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes.txt	
@@ -0,0 +1,15 @@
+Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?
+
+A named person is someone who appears on someone else’s passport.
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no.html
deleted file mode 100644
index e64a74b1a2e..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no.html	
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the person have a certificate of right of abode in their passport?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no.txt
new file mode 100644
index 00000000000..00015b31537
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no.txt	
@@ -0,0 +1,14 @@
+Does the person have a certificate of right of abode in their passport?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no.html
deleted file mode 100644
index b62a2029073..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no.html	
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the person have a Certificate of Registration or Naturalisation as a British citizen?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a certificate of right of abode in their passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a certificate of right of abode in their passport?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no.txt
new file mode 100644
index 00000000000..f56b826b355
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no.txt	
@@ -0,0 +1,14 @@
+Does the person have a Certificate of Registration or Naturalisation as a British citizen?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no.html
deleted file mode 100644
index 52f026e4025..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no.html	
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the person:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="eu_eea_switzerland" />
-        from the EU, EEA or Switzerland
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="non_eea_but_with_eu_eea_switzerland_family_member" />
-        a non-EEA family member of someone from the EU, EEA or Switzerland
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="somewhere_else" />
-        from somewhere else
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a certificate of right of abode in their passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a certificate of right of abode in their passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a Certificate of Registration or Naturalisation as a British citizen?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a Certificate of Registration or Naturalisation as a British citizen?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no.txt
new file mode 100644
index 00000000000..9d90855a9e0
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no.txt	
@@ -0,0 +1,15 @@
+Is the person:
+
+
+
+
+
+  * eu_eea_switzerland: from the EU, EEA or Switzerland
+  * non_eea_but_with_eu_eea_switzerland_family_member: a non-EEA family member of someone from the EU, EEA or Switzerland
+  * somewhere_else: from somewhere else
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland.html
deleted file mode 100644
index fd023f499ef..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland.html	
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the person have any of the following:
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>a Registration Certificate or Document Certifying Permanent Residence issued by the Home Office to a national of the EU, EEA or Switzerland</li>
-  <li>a valid Biometric Residence Permit issued by the Home Office endorsed to show they’re allowed to stay indefinitely in the UK</li>
-  <li>a Permanent Residence Card, indefinite leave to remain, indefinite leave to enter or no time limit card issued by the Home Office</li>
-  <li>a valid passport showing that the person is exempt from immigration control, can stay indefinitely in the UK, has the right of abode in the UK or has no time limit on their stay in the UK</li>
-  <li>a current Immigration Status Document showing that the person has indefinite leave to stay in the UK or has no time limit to their stay</li>
-  <li>other documents exempting the person from immigration control (eg diplomatic passports, NATO ID card)</li>
-</ul>
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a certificate of right of abode in their passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a certificate of right of abode in their passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a Certificate of Registration or Naturalisation as a British citizen?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a Certificate of Registration or Naturalisation as a British citizen?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person:</td>
-    <td class="previous-question-body">
-    from the EU, EEA or Switzerland</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no?previous_response=eu_eea_switzerland">
-      Change<span class="visuallyhidden"> answer to "Is the person:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland.txt
new file mode 100644
index 00000000000..722fe48ff92
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland.txt	
@@ -0,0 +1,20 @@
+Does the person have any of the following:
+
+- a Registration Certificate or Document Certifying Permanent Residence issued by the Home Office to a national of the EU, EEA or Switzerland
+- a valid Biometric Residence Permit issued by the Home Office endorsed to show they’re allowed to stay indefinitely in the UK
+- a Permanent Residence Card, indefinite leave to remain, indefinite leave to enter or no time limit card issued by the Home Office
+- a valid passport showing that the person is exempt from immigration control, can stay indefinitely in the UK, has the right of abode in the UK or has no time limit on their stay in the UK
+- a current Immigration Status Document showing that the person has indefinite leave to stay in the UK or has no time limit to their stay
+- other documents exempting the person from immigration control (eg diplomatic passports, NATO ID card)
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no.html
deleted file mode 100644
index acbf7b1f02f..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no.html	
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the person have 2 of the following:
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>a full birth or adoption certificate (that shows details of at least one of the birth or adoptive parents) from the UK, the Channel Islands, the Isle of Man or Ireland</li>
-  <li>a letter from a UK police force issued within the last 3 months confirming the person is a victim of crime and their documents have been stolen</li>
-  <li>evidence that the person is currently serving in the UK armed forces or has previously served</li>
-  <li>a current UK driving licence (either full or provisional)</li>
-  <li>a Disclosure or Barring Service certificate issued in the last 3 months </li>
-  <li>benefits paperwork from HMRC, a local authority, the Department for Work and Pensions (DWP) or Jobcentre Plus within the last 3 months</li>
-  <li>a letter dated in the last 3 months from a UK further or higher education institution confirming the person has been accepted on a course, the name of the institution, and the name and length of the course </li>
-  <li>a letter dated in the last 3 months from an organisation that operates a scheme to prevent or resolve homelessness with the person&rsquo;s name and likely address</li>
-  <li>a letter showing supervision order dated in the last 3 months from the National Offender Management Service in England and Wales (or the equivalents in Scotland or Northern Ireland)</li>
-  <li>HM prison discharge papers dated in the last 6 months (or the same from the Scottish or Northern Ireland Prison Service)</li>
-  <li>a letter dated in the last 3 months from a British passport holder who does a job listed in annex A of the <a href="/government/publications/right-to-rent-landlords-code-of-practice/code-of-practice-on-illegal-immigrants-and-private-rented-accommodation-for-tenancies-starting-on-or-after-1-february-2016#annex-a---list-of-acceptable-professional-persons">code of practice</a> and has known the person for at least 3 months (with their name, address, passport number, job and place of work (or former place of work if retired), and how long they have known the holder and in what capacity)</li>
-  <li>an official letter or document (dated within the last 3 months) from a government or Local Authority (with their name and work address) that confirms the person’s name</li>
-  <li>an official letter (dated within the last 3 months) from their employer (with their name and company address) that confirms the person’s name, that they’re an employee and their employee reference number or National Insurance number</li>
-</ul>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a certificate of right of abode in their passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a certificate of right of abode in their passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a Certificate of Registration or Naturalisation as a British citizen?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a Certificate of Registration or Naturalisation as a British citizen?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person:</td>
-    <td class="previous-question-body">
-    from the EU, EEA or Switzerland</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no?previous_response=eu_eea_switzerland">
-      Change<span class="visuallyhidden"> answer to "Is the person:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have any of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have any of the following:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no.txt
new file mode 100644
index 00000000000..dbdb69485fa
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no.txt	
@@ -0,0 +1,27 @@
+Does the person have 2 of the following:
+
+- a full birth or adoption certificate (that shows details of at least one of the birth or adoptive parents) from the UK, the Channel Islands, the Isle of Man or Ireland
+- a letter from a UK police force issued within the last 3 months confirming the person is a victim of crime and their documents have been stolen
+- evidence that the person is currently serving in the UK armed forces or has previously served
+- a current UK driving licence (either full or provisional)
+- a Disclosure or Barring Service certificate issued in the last 3 months 
+- benefits paperwork from HMRC, a local authority, the Department for Work and Pensions (DWP) or Jobcentre Plus within the last 3 months
+- a letter dated in the last 3 months from a UK further or higher education institution confirming the person has been accepted on a course, the name of the institution, and the name and length of the course 
+- a letter dated in the last 3 months from an organisation that operates a scheme to prevent or resolve homelessness with the person's name and likely address
+- a letter showing supervision order dated in the last 3 months from the National Offender Management Service in England and Wales (or the equivalents in Scotland or Northern Ireland)
+- HM prison discharge papers dated in the last 6 months (or the same from the Scottish or Northern Ireland Prison Service)
+- a letter dated in the last 3 months from a British passport holder who does a job listed in annex A of the [code of practice](/government/publications/right-to-rent-landlords-code-of-practice/code-of-practice-on-illegal-immigrants-and-private-rented-accommodation-for-tenancies-starting-on-or-after-1-february-2016#annex-a---list-of-acceptable-professional-persons) and has known the person for at least 3 months (with their name, address, passport number, job and place of work (or former place of work if retired), and how long they have known the holder and in what capacity)
+- an official letter or document (dated within the last 3 months) from a government or Local Authority (with their name and work address) that confirms the person’s name
+- an official letter (dated within the last 3 months) from their employer (with their name and company address) that confirms the person’s name, that they’re an employee and their employee reference number or National Insurance number
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no.html
deleted file mode 100644
index 10d90b26042..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no.html	
+++ /dev/null
@@ -1,211 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the person have any of the following:
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>a passport endorsed to show that the person can stay in the UK temporarily</li>
-  <li>a current Biometric Residence Permit issued by the Home Office to the person showing that they can currently stay in the UK temporarily</li>
-  <li>an Immigration Status Document issued by the Home Office with an endorsement showing the person can currently stay in the UK temporarily</li>
-</ul>
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a certificate of right of abode in their passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a certificate of right of abode in their passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a Certificate of Registration or Naturalisation as a British citizen?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a Certificate of Registration or Naturalisation as a British citizen?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person:</td>
-    <td class="previous-question-body">
-    from the EU, EEA or Switzerland</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no?previous_response=eu_eea_switzerland">
-      Change<span class="visuallyhidden"> answer to "Is the person:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have any of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have any of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have 2 of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have 2 of the following:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no.txt
new file mode 100644
index 00000000000..7170aac84ea
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no.txt	
@@ -0,0 +1,17 @@
+Does the person have any of the following:
+
+- a passport endorsed to show that the person can stay in the UK temporarily
+- a current Biometric Residence Permit issued by the Home Office to the person showing that they can currently stay in the UK temporarily
+- an Immigration Status Document issued by the Home Office with an endorsement showing the person can currently stay in the UK temporarily
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no.html
deleted file mode 100644
index d813793e2fa..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no.html	
+++ /dev/null
@@ -1,218 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the person have a current Residence Card that is issued by the Home Office to a non-EEA national who is the family member of an EU, EEA or Swiss national?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>This includes a current Accession Card or Derivative Card.</p>
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a certificate of right of abode in their passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a certificate of right of abode in their passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a Certificate of Registration or Naturalisation as a British citizen?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a Certificate of Registration or Naturalisation as a British citizen?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person:</td>
-    <td class="previous-question-body">
-    from the EU, EEA or Switzerland</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no?previous_response=eu_eea_switzerland">
-      Change<span class="visuallyhidden"> answer to "Is the person:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have any of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have any of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have 2 of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have 2 of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have any of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have any of the following:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no.txt
new file mode 100644
index 00000000000..d0f9b20c4bc
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no.txt	
@@ -0,0 +1,15 @@
+Does the person have a current Residence Card that is issued by the Home Office to a non-EEA national who is the family member of an EU, EEA or Swiss national?
+
+This includes a current Accession Card or Derivative Card.
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no.html
deleted file mode 100644
index cf7f952fcaf..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no.html	
+++ /dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the person have an application for a Registration Card issued by the Home Office showing that they can stay in the UK?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a certificate of right of abode in their passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a certificate of right of abode in their passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a Certificate of Registration or Naturalisation as a British citizen?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a Certificate of Registration or Naturalisation as a British citizen?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person:</td>
-    <td class="previous-question-body">
-    from the EU, EEA or Switzerland</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no?previous_response=eu_eea_switzerland">
-      Change<span class="visuallyhidden"> answer to "Is the person:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have any of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have any of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have 2 of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have 2 of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have any of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have any of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current Residence Card that is issued by the Home Office to a non-EEA national who is the family member of an EU, EEA or Swiss national?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current Residence Card that is issued by the Home Office to a non-EEA national who is the family member of an EU, EEA or Swiss national?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no.txt
new file mode 100644
index 00000000000..3f51b6912df
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no.txt	
@@ -0,0 +1,14 @@
+Does the person have an application for a Registration Card issued by the Home Office showing that they can stay in the UK?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no/no.html b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no/no.html
deleted file mode 100644
index 58a8465e83e..00000000000
--- a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no/no.html	
+++ /dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the person have an outstanding immigration case, immigration appeal or administrative review?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>They must also provide their Home Office reference number.</p>
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/landlord-immigration-check">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Enter the postcode of the property you want to let:</td>
-    <td class="previous-question-body">
-    B1 1PW</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y?previous_response=B1+1PW">
-      Change<span class="visuallyhidden"> answer to "Enter the postcode of the property you want to let:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person renting the property as their main home?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person renting the property as their main home?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person at least 18 years of age?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the person at least 18 years of age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current or expired UK or Republic of Ireland passport or are they a named person in their parent’s UK or Republic of Ireland passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a certificate of right of abode in their passport?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a certificate of right of abode in their passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a Certificate of Registration or Naturalisation as a British citizen?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a Certificate of Registration or Naturalisation as a British citizen?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the person:</td>
-    <td class="previous-question-body">
-    from the EU, EEA or Switzerland</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no?previous_response=eu_eea_switzerland">
-      Change<span class="visuallyhidden"> answer to "Is the person:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have any of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have any of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have 2 of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have 2 of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have any of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have any of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have a current Residence Card that is issued by the Home Office to a non-EEA national who is the family member of an EU, EEA or Swiss national?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have a current Residence Card that is issued by the Home Office to a non-EEA national who is the family member of an EU, EEA or Swiss national?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the person have an application for a Registration Card issued by the Home Office showing that they can stay in the UK?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/landlord-immigration-check/y/B1%201PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Does the person have an application for a Registration Card issued by the Home Office showing that they can stay in the UK?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no/no.txt b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no/no.txt
new file mode 100644
index 00000000000..e9ab4b31003
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/B1 1PW/yes/yes/no/no/no/eu_eea_switzerland/no/no/no/no/no.txt	
@@ -0,0 +1,15 @@
+Does the person have an outstanding immigration case, immigration appeal or administrative review?
+
+They must also provide their Home Office reference number.
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/landlord-immigration-check/y.html b/test/artefacts/landlord-immigration-check/y.html
deleted file mode 100644
index db410c02dde..00000000000
--- a/test/artefacts/landlord-immigration-check/y.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if someone can rent your residential property - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if someone can rent your residential property
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/landlord-immigration-check/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Enter the postcode of the property you want to let:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">
-  <input type="text" name="response" id="response" />
-</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/landlord-immigration-check/y.txt b/test/artefacts/landlord-immigration-check/y.txt
new file mode 100644
index 00000000000..f5e2575564b
--- /dev/null
+++ b/test/artefacts/landlord-immigration-check/y.txt
@@ -0,0 +1,12 @@
+Enter the postcode of the property you want to let:
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/legalisation-document-checker/y.html b/test/artefacts/legalisation-document-checker/y.html
deleted file mode 100644
index e32016e8fb1..00000000000
--- a/test/artefacts/legalisation-document-checker/y.html
+++ /dev/null
@@ -1,444 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if documents can be legalised - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if documents can be legalised
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/legalisation-document-checker/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which documents do you want legalised?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="acro-police-certificate" />
-        ACRO Police Certificate
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="affidavit" />
-        Affidavit
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="articles-of-association" />
-        Articles of association
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="bank-statement" />
-        Bank statement
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="baptism-certificate" />
-        Baptism certificate
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="birth-certificate" />
-        Birth certificate
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="checkbox" name="response[]" id="response_6" value="certificate-of-incorporation" />
-        Certificate of incorporation
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="checkbox" name="response[]" id="response_7" value="certificate-of-freesale" />
-        Certificate of freesale
-      </label>
-    </li>
-    <li>
-      <label for="response_8" class="selectable">
-        <input type="checkbox" name="response[]" id="response_8" value="certificate-of-memorandum" />
-        Certificate of memorandum
-      </label>
-    </li>
-    <li>
-      <label for="response_9" class="selectable">
-        <input type="checkbox" name="response[]" id="response_9" value="certificate-of-naturalisation" />
-        Certificate of naturalisation
-      </label>
-    </li>
-    <li>
-      <label for="response_10" class="selectable">
-        <input type="checkbox" name="response[]" id="response_10" value="certificate-of-no-impediment" />
-        Certificate of no impediment
-      </label>
-    </li>
-    <li>
-      <label for="response_11" class="selectable">
-        <input type="checkbox" name="response[]" id="response_11" value="chamber-of-commerce-document" />
-        Chamber of Commerce document
-      </label>
-    </li>
-    <li>
-      <label for="response_12" class="selectable">
-        <input type="checkbox" name="response[]" id="response_12" value="change-of-name-deed" />
-        Change of name deed
-      </label>
-    </li>
-    <li>
-      <label for="response_13" class="selectable">
-        <input type="checkbox" name="response[]" id="response_13" value="civil-partnership-certificate" />
-        Civil partnership certificate
-      </label>
-    </li>
-    <li>
-      <label for="response_14" class="selectable">
-        <input type="checkbox" name="response[]" id="response_14" value="criminal-records-bureau-document" />
-        Criminal Records Bureau (CRB) document
-      </label>
-    </li>
-    <li>
-      <label for="response_15" class="selectable">
-        <input type="checkbox" name="response[]" id="response_15" value="criminal-records-check" />
-        Criminal records check
-      </label>
-    </li>
-    <li>
-      <label for="response_16" class="selectable">
-        <input type="checkbox" name="response[]" id="response_16" value="companies-house-document" />
-        Companies House document
-      </label>
-    </li>
-    <li>
-      <label for="response_17" class="selectable">
-        <input type="checkbox" name="response[]" id="response_17" value="county-court-document" />
-        County court document
-      </label>
-    </li>
-    <li>
-      <label for="response_18" class="selectable">
-        <input type="checkbox" name="response[]" id="response_18" value="court-document" />
-        Court document
-      </label>
-    </li>
-    <li>
-      <label for="response_19" class="selectable">
-        <input type="checkbox" name="response[]" id="response_19" value="court-of-bankruptcy-document" />
-        Court of Bankruptcy document
-      </label>
-    </li>
-    <li>
-      <label for="response_20" class="selectable">
-        <input type="checkbox" name="response[]" id="response_20" value="death-certificate" />
-        Death certificate
-      </label>
-    </li>
-    <li>
-      <label for="response_21" class="selectable">
-        <input type="checkbox" name="response[]" id="response_21" value="decree-nisi" />
-        Decree nisi
-      </label>
-    </li>
-    <li>
-      <label for="response_22" class="selectable">
-        <input type="checkbox" name="response[]" id="response_22" value="decree-absolute" />
-        Decree absolute
-      </label>
-    </li>
-    <li>
-      <label for="response_23" class="selectable">
-        <input type="checkbox" name="response[]" id="response_23" value="degree-certificate-uk" />
-        Degree certificate (UK)
-      </label>
-    </li>
-    <li>
-      <label for="response_24" class="selectable">
-        <input type="checkbox" name="response[]" id="response_24" value="department-of-business-innovation-skills-document" />
-        Department of Business, Innovation and Skills (BIS) document
-      </label>
-    </li>
-    <li>
-      <label for="response_25" class="selectable">
-        <input type="checkbox" name="response[]" id="response_25" value="department-of-health-document" />
-        Department of Health document
-      </label>
-    </li>
-    <li>
-      <label for="response_26" class="selectable">
-        <input type="checkbox" name="response[]" id="response_26" value="diploma" />
-        Diploma
-      </label>
-    </li>
-    <li>
-      <label for="response_27" class="selectable">
-        <input type="checkbox" name="response[]" id="response_27" value="disclosure-scotland-document" />
-        Disclosure Scotland document
-      </label>
-    </li>
-    <li>
-      <label for="response_28" class="selectable">
-        <input type="checkbox" name="response[]" id="response_28" value="doctor-letter-medical" />
-        Doctor’s letter (medical)
-      </label>
-    </li>
-    <li>
-      <label for="response_29" class="selectable">
-        <input type="checkbox" name="response[]" id="response_29" value="driving-licence" />
-        Driving licence (copy)
-      </label>
-    </li>
-    <li>
-      <label for="response_30" class="selectable">
-        <input type="checkbox" name="response[]" id="response_30" value="educational-certificate-uk" />
-        Educational certificate (UK)
-      </label>
-    </li>
-    <li>
-      <label for="response_31" class="selectable">
-        <input type="checkbox" name="response[]" id="response_31" value="export-certificate" />
-        Export certificate
-      </label>
-    </li>
-    <li>
-      <label for="response_32" class="selectable">
-        <input type="checkbox" name="response[]" id="response_32" value="family-division-high-court-justice-document" />
-        Family Division of the High Court of Justice document
-      </label>
-    </li>
-    <li>
-      <label for="response_33" class="selectable">
-        <input type="checkbox" name="response[]" id="response_33" value="fingerprints" />
-        Fingerprints document
-      </label>
-    </li>
-    <li>
-      <label for="response_34" class="selectable">
-        <input type="checkbox" name="response[]" id="response_34" value="fit-note-from-a-doctor" />
-        Fit note (from a doctor)
-      </label>
-    </li>
-    <li>
-      <label for="response_35" class="selectable">
-        <input type="checkbox" name="response[]" id="response_35" value="government-issued-document" />
-        Government issued document
-      </label>
-    </li>
-    <li>
-      <label for="response_36" class="selectable">
-        <input type="checkbox" name="response[]" id="response_36" value="grant-of-probate" />
-        Grant of probate
-      </label>
-    </li>
-    <li>
-      <label for="response_37" class="selectable">
-        <input type="checkbox" name="response[]" id="response_37" value="high-court-justice-document" />
-        High Court of Justice document
-      </label>
-    </li>
-    <li>
-      <label for="response_38" class="selectable">
-        <input type="checkbox" name="response[]" id="response_38" value="hmrc-document" />
-        HM Revenue and Customs document
-      </label>
-    </li>
-    <li>
-      <label for="response_39" class="selectable">
-        <input type="checkbox" name="response[]" id="response_39" value="home-office-document" />
-        Home Office document
-      </label>
-    </li>
-    <li>
-      <label for="response_40" class="selectable">
-        <input type="checkbox" name="response[]" id="response_40" value="last-will-testament" />
-        Last will and testament
-      </label>
-    </li>
-    <li>
-      <label for="response_41" class="selectable">
-        <input type="checkbox" name="response[]" id="response_41" value="letter-from-employer" />
-        Letter from an employer
-      </label>
-    </li>
-    <li>
-      <label for="response_42" class="selectable">
-        <input type="checkbox" name="response[]" id="response_42" value="letter-of-enrolment" />
-        Letter of enrolment
-      </label>
-    </li>
-    <li>
-      <label for="response_43" class="selectable">
-        <input type="checkbox" name="response[]" id="response_43" value="letter-of-invitation" />
-        Letter of invitation
-      </label>
-    </li>
-    <li>
-      <label for="response_44" class="selectable">
-        <input type="checkbox" name="response[]" id="response_44" value="letter-of-no-trace" />
-        Letter of no trace
-      </label>
-    </li>
-    <li>
-      <label for="response_45" class="selectable">
-        <input type="checkbox" name="response[]" id="response_45" value="medical-report" />
-        Medical report
-      </label>
-    </li>
-    <li>
-      <label for="response_46" class="selectable">
-        <input type="checkbox" name="response[]" id="response_46" value="marriage-certificate" />
-        Marriage certificate
-      </label>
-    </li>
-    <li>
-      <label for="response_47" class="selectable">
-        <input type="checkbox" name="response[]" id="response_47" value="name-change-deed-or-document" />
-        Name change deed or document
-      </label>
-    </li>
-    <li>
-      <label for="response_48" class="selectable">
-        <input type="checkbox" name="response[]" id="response_48" value="passport-copy-only" />
-        Passport (copy only)
-      </label>
-    </li>
-    <li>
-      <label for="response_49" class="selectable">
-        <input type="checkbox" name="response[]" id="response_49" value="pet-export-document" />
-        Pet export document from the Department of Environment, Food and Rural Affairs (DEFRA)
-      </label>
-    </li>
-    <li>
-      <label for="response_50" class="selectable">
-        <input type="checkbox" name="response[]" id="response_50" value="police-disclosure-document" />
-        Police disclosure document
-      </label>
-    </li>
-    <li>
-      <label for="response_51" class="selectable">
-        <input type="checkbox" name="response[]" id="response_51" value="power-of-attorney" />
-        Power of attorney
-      </label>
-    </li>
-    <li>
-      <label for="response_52" class="selectable">
-        <input type="checkbox" name="response[]" id="response_52" value="probate" />
-        Probate
-      </label>
-    </li>
-    <li>
-      <label for="response_53" class="selectable">
-        <input type="checkbox" name="response[]" id="response_53" value="reference-from-an-employer" />
-        Reference from an employer
-      </label>
-    </li>
-    <li>
-      <label for="response_54" class="selectable">
-        <input type="checkbox" name="response[]" id="response_54" value="religious-document" />
-        Religious document
-      </label>
-    </li>
-    <li>
-      <label for="response_55" class="selectable">
-        <input type="checkbox" name="response[]" id="response_55" value="sheriff-court-document" />
-        Sheriff court document
-      </label>
-    </li>
-    <li>
-      <label for="response_56" class="selectable">
-        <input type="checkbox" name="response[]" id="response_56" value="sick-note-from-doctor" />
-        Sick note (from a doctor)
-      </label>
-    </li>
-    <li>
-      <label for="response_57" class="selectable">
-        <input type="checkbox" name="response[]" id="response_57" value="statutory-declaration" />
-        Statutory declaration
-      </label>
-    </li>
-    <li>
-      <label for="response_58" class="selectable">
-        <input type="checkbox" name="response[]" id="response_58" value="test-results-medical" />
-        Test results (medical)
-      </label>
-    </li>
-    <li>
-      <label for="response_59" class="selectable">
-        <input type="checkbox" name="response[]" id="response_59" value="translation" />
-        Translation
-      </label>
-    </li>
-    <li>
-      <label for="response_60" class="selectable">
-        <input type="checkbox" name="response[]" id="response_60" value="utility-bill" />
-        Utility bill
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/legalisation-document-checker/y.txt b/test/artefacts/legalisation-document-checker/y.txt
new file mode 100644
index 00000000000..35c7860986c
--- /dev/null
+++ b/test/artefacts/legalisation-document-checker/y.txt
@@ -0,0 +1,73 @@
+Which documents do you want legalised?
+
+
+
+
+
+  * acro-police-certificate: ACRO Police Certificate
+  * affidavit: Affidavit
+  * articles-of-association: Articles of association
+  * bank-statement: Bank statement
+  * baptism-certificate: Baptism certificate
+  * birth-certificate: Birth certificate
+  * certificate-of-incorporation: Certificate of incorporation
+  * certificate-of-freesale: Certificate of freesale
+  * certificate-of-memorandum: Certificate of memorandum
+  * certificate-of-naturalisation: Certificate of naturalisation
+  * certificate-of-no-impediment: Certificate of no impediment
+  * chamber-of-commerce-document: Chamber of Commerce document
+  * change-of-name-deed: Change of name deed
+  * civil-partnership-certificate: Civil partnership certificate
+  * criminal-records-bureau-document: Criminal Records Bureau (CRB) document
+  * criminal-records-check: Criminal records check
+  * companies-house-document: Companies House document
+  * county-court-document: County court document
+  * court-document: Court document
+  * court-of-bankruptcy-document: Court of Bankruptcy document
+  * death-certificate: Death certificate
+  * decree-nisi: Decree nisi
+  * decree-absolute: Decree absolute
+  * degree-certificate-uk: Degree certificate (UK)
+  * department-of-business-innovation-skills-document: Department of Business, Innovation and Skills (BIS) document
+  * department-of-health-document: Department of Health document
+  * diploma: Diploma
+  * disclosure-scotland-document: Disclosure Scotland document
+  * doctor-letter-medical: Doctor’s letter (medical)
+  * driving-licence: Driving licence (copy)
+  * educational-certificate-uk: Educational certificate (UK)
+  * export-certificate: Export certificate
+  * family-division-high-court-justice-document: Family Division of the High Court of Justice document
+  * fingerprints: Fingerprints document
+  * fit-note-from-a-doctor: Fit note (from a doctor)
+  * government-issued-document: Government issued document
+  * grant-of-probate: Grant of probate
+  * high-court-justice-document: High Court of Justice document
+  * hmrc-document: HM Revenue and Customs document
+  * home-office-document: Home Office document
+  * last-will-testament: Last will and testament
+  * letter-from-employer: Letter from an employer
+  * letter-of-enrolment: Letter of enrolment
+  * letter-of-invitation: Letter of invitation
+  * letter-of-no-trace: Letter of no trace
+  * medical-report: Medical report
+  * marriage-certificate: Marriage certificate
+  * name-change-deed-or-document: Name change deed or document
+  * passport-copy-only: Passport (copy only)
+  * pet-export-document: Pet export document from the Department of Environment, Food and Rural Affairs (DEFRA)
+  * police-disclosure-document: Police disclosure document
+  * power-of-attorney: Power of attorney
+  * probate: Probate
+  * reference-from-an-employer: Reference from an employer
+  * religious-document: Religious document
+  * sheriff-court-document: Sheriff court document
+  * sick-note-from-doctor: Sick note (from a doctor)
+  * statutory-declaration: Statutory declaration
+  * test-results-medical: Test results (medical)
+  * translation: Translation
+  * utility-bill: Utility bill
+
+
+
+
+
+
diff --git a/test/artefacts/marriage-abroad/albania.html b/test/artefacts/marriage-abroad/albania.html
deleted file mode 100644
index d818df59457..00000000000
--- a/test/artefacts/marriage-abroad/albania.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Getting married abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Getting married abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/marriage-abroad/y/albania" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Where do you live?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="uk" />
-        UK
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="ceremony_country" />
-        Albania
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="third_country" />
-        Elsewhere
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/marriage-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where do you want to get married?</td>
-    <td class="previous-question-body">
-    Albania</td>
-
-  <td class="link-right">
-    <a href="/marriage-abroad/y?previous_response=albania">
-      Change<span class="visuallyhidden"> answer to "Where do you want to get married?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/marriage-abroad/albania.txt b/test/artefacts/marriage-abroad/albania.txt
new file mode 100644
index 00000000000..a5a8d7abad3
--- /dev/null
+++ b/test/artefacts/marriage-abroad/albania.txt
@@ -0,0 +1,15 @@
+Where do you live?
+
+
+
+
+
+  * uk: UK
+  * ceremony_country: Albania
+  * third_country: Elsewhere
+
+
+
+
+
+
diff --git a/test/artefacts/marriage-abroad/albania/uk.html b/test/artefacts/marriage-abroad/albania/uk.html
deleted file mode 100644
index b639e92c79c..00000000000
--- a/test/artefacts/marriage-abroad/albania/uk.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Getting married abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Getting married abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/marriage-abroad/y/albania/uk" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is your partner’s nationality?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="partner_british" />
-        British
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="partner_local" />
-        National of Albania
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="partner_other" />
-        National of another country
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/marriage-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where do you want to get married?</td>
-    <td class="previous-question-body">
-    Albania</td>
-
-  <td class="link-right">
-    <a href="/marriage-abroad/y?previous_response=albania">
-      Change<span class="visuallyhidden"> answer to "Where do you want to get married?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Where do you live?</td>
-    <td class="previous-question-body">
-    UK</td>
-
-  <td class="link-right">
-    <a href="/marriage-abroad/y/albania?previous_response=uk">
-      Change<span class="visuallyhidden"> answer to "Where do you live?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/marriage-abroad/albania/uk.txt b/test/artefacts/marriage-abroad/albania/uk.txt
new file mode 100644
index 00000000000..56dc388fc83
--- /dev/null
+++ b/test/artefacts/marriage-abroad/albania/uk.txt
@@ -0,0 +1,15 @@
+What is your partner’s nationality?
+
+
+
+
+
+  * partner_british: British
+  * partner_local: National of Albania
+  * partner_other: National of another country
+
+
+
+
+
+
diff --git a/test/artefacts/marriage-abroad/albania/uk/partner_british.html b/test/artefacts/marriage-abroad/albania/uk/partner_british.html
deleted file mode 100644
index 01b5ccbddce..00000000000
--- a/test/artefacts/marriage-abroad/albania/uk/partner_british.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Getting married abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Getting married abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/marriage-abroad/y/albania/uk/partner_british" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is your partner of the opposite sex, or the same sex?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="opposite_sex" />
-        Opposite sex
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="same_sex" />
-        Same sex
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/marriage-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where do you want to get married?</td>
-    <td class="previous-question-body">
-    Albania</td>
-
-  <td class="link-right">
-    <a href="/marriage-abroad/y?previous_response=albania">
-      Change<span class="visuallyhidden"> answer to "Where do you want to get married?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Where do you live?</td>
-    <td class="previous-question-body">
-    UK</td>
-
-  <td class="link-right">
-    <a href="/marriage-abroad/y/albania?previous_response=uk">
-      Change<span class="visuallyhidden"> answer to "Where do you live?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is your partner’s nationality?</td>
-    <td class="previous-question-body">
-    British</td>
-
-  <td class="link-right">
-    <a href="/marriage-abroad/y/albania/uk?previous_response=partner_british">
-      Change<span class="visuallyhidden"> answer to "What is your partner’s nationality?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/marriage-abroad/albania/uk/partner_british.txt b/test/artefacts/marriage-abroad/albania/uk/partner_british.txt
new file mode 100644
index 00000000000..29bdc6e27f1
--- /dev/null
+++ b/test/artefacts/marriage-abroad/albania/uk/partner_british.txt
@@ -0,0 +1,14 @@
+Is your partner of the opposite sex, or the same sex?
+
+
+
+
+
+  * opposite_sex: Opposite sex
+  * same_sex: Same sex
+
+
+
+
+
+
diff --git a/test/artefacts/marriage-abroad/france.html b/test/artefacts/marriage-abroad/france.html
deleted file mode 100644
index da4af38fc31..00000000000
--- a/test/artefacts/marriage-abroad/france.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Getting married abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Getting married abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/marriage-abroad/y/france" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you want to get married or enter into a PACS?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">PACS (‘pacte civil de solidarité’, or ‘civil solidarity pact’) is the French version of civil partnership, and can be entered into by same-sex or opposite-sex couples.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="marriage" />
-        Marriage
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="pacs" />
-        PACS
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/marriage-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where do you want to get married?</td>
-    <td class="previous-question-body">
-    France</td>
-
-  <td class="link-right">
-    <a href="/marriage-abroad/y?previous_response=france">
-      Change<span class="visuallyhidden"> answer to "Where do you want to get married?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/marriage-abroad/france.txt b/test/artefacts/marriage-abroad/france.txt
new file mode 100644
index 00000000000..098fa98c41e
--- /dev/null
+++ b/test/artefacts/marriage-abroad/france.txt
@@ -0,0 +1,14 @@
+Do you want to get married or enter into a PACS?
+
+
+
+PACS (‘pacte civil de solidarité’, or ‘civil solidarity pact’) is the French version of civil partnership, and can be entered into by same-sex or opposite-sex couples.
+
+  * marriage: Marriage
+  * pacs: PACS
+
+
+
+
+
+
diff --git a/test/artefacts/marriage-abroad/y.html b/test/artefacts/marriage-abroad/y.html
deleted file mode 100644
index 76bda573ddb..00000000000
--- a/test/artefacts/marriage-abroad/y.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Getting married abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Getting married abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/marriage-abroad/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Where do you want to get married?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-guiana">French Guiana</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guadeloupe">Guadeloupe</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="martinique">Martinique</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mayotte">Mayotte</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="reunion">Reunion</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/marriage-abroad/y.txt b/test/artefacts/marriage-abroad/y.txt
new file mode 100644
index 00000000000..9c2d736e670
--- /dev/null
+++ b/test/artefacts/marriage-abroad/y.txt
@@ -0,0 +1,237 @@
+Where do you want to get married?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-guiana: French Guiana
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guadeloupe: Guadeloupe
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * martinique: Martinique
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mayotte: Mayotte
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * reunion: Reunion
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption.html b/test/artefacts/maternity-paternity-calculator/adoption.html
deleted file mode 100644
index fdf9b1a8386..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the employee taking paternity leave to adopt a child?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption.txt b/test/artefacts/maternity-paternity-calculator/adoption.txt
new file mode 100644
index 00000000000..7aeb03c1025
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption.txt
@@ -0,0 +1,14 @@
+Is the employee taking paternity leave to adopt a child?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no.html b/test/artefacts/maternity-paternity-calculator/adoption/no.html
deleted file mode 100644
index b9880e370b6..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When was the child matched with the employee?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">For overseas adoptions, enter the official notification date (the permission to adopt from abroad).</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no.txt b/test/artefacts/maternity-paternity-calculator/adoption/no.txt
new file mode 100644
index 00000000000..3b29d2221ec
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no.txt
@@ -0,0 +1,12 @@
+When was the child matched with the employee?
+
+
+
+For overseas adoptions, enter the official notification date (the permission to adopt from abroad).
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05.html
deleted file mode 100644
index 1b6d8e81c47..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When will the child be placed with the employee?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">For overseas adoptions enter the date of arrival in the UK.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05.txt
new file mode 100644
index 00000000000..6df76e8ba94
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05.txt
@@ -0,0 +1,12 @@
+When will the child be placed with the employee?
+
+
+
+For overseas adoptions enter the date of arrival in the UK.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06.html
deleted file mode 100644
index e9c14ae0d20..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the employee work for you on or before 18 October 2014?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06.txt
new file mode 100644
index 00000000000..3282a88322e
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06.txt
@@ -0,0 +1,14 @@
+Did the employee work for you on or before 18 October 2014?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes.html
deleted file mode 100644
index 6bc153c8120..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the employee have an employment contract with you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 18 October 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 18 October 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes.txt
new file mode 100644
index 00000000000..562633a01f6
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes.txt
@@ -0,0 +1,14 @@
+Does the employee have an employment contract with you?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes.html
deleted file mode 100644
index afda85213fa..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Was the employee (or will they be) on your payroll on 21 December 2014?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 18 October 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 18 October 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes.txt
new file mode 100644
index 00000000000..2fbdcb58751
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes.txt
@@ -0,0 +1,14 @@
+Was the employee (or will they be) on your payroll on 21 December 2014?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes.html
deleted file mode 100644
index 53af46d8c5b..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When does the employee want to start their leave?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Leave can’t start before 23 March 2015. For overseas adoptions your leave must start within 28 days of the child arriving in the UK.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 18 October 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 18 October 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes.txt
new file mode 100644
index 00000000000..e071caaf54c
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes.txt
@@ -0,0 +1,12 @@
+When does the employee want to start their leave?
+
+
+
+Leave can’t start before 23 March 2015. For overseas adoptions your leave must start within 28 days of the child arriving in the UK.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06.html
deleted file mode 100644
index 0179fef7f0b..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the last normal payday on or before Saturday, 11 April 2015?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 18 October 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 18 October 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06.txt
new file mode 100644
index 00000000000..5b822f15fb7
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06.txt
@@ -0,0 +1,12 @@
+What was the last normal payday on or before Saturday, 11 April 2015?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01.html
deleted file mode 100644
index 87c0810d96a..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the last normal payday before Friday, 07 November 2014?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 18 October 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 18 October 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 11 April 2015?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 11 April 2015?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01.txt
new file mode 100644
index 00000000000..3e0c7b45f50
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01.txt
@@ -0,0 +1,12 @@
+What was the last normal payday before Friday, 07 November 2014?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01.html
deleted file mode 100644
index d3caac1a570..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you pay the employee?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If they’re paid irregularly choose ‘weekly’.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly" />
-        Weekly
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="every_2_weeks" />
-        Every 2 weeks
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="every_4_weeks" />
-        Every 4 weeks
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="monthly" />
-        Monthly
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 18 October 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 18 October 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 11 April 2015?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 11 April 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014?</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01.txt
new file mode 100644
index 00000000000..b00198341cd
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01.txt
@@ -0,0 +1,16 @@
+How often do you pay the employee?
+
+
+
+If they’re paid irregularly choose ‘weekly’.
+
+  * weekly: Weekly
+  * every_2_weeks: Every 2 weeks
+  * every_4_weeks: Every 4 weeks
+  * monthly: Monthly
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly.html
deleted file mode 100644
index 6bb38d7b022..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What were the employee’s total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This is their earnings before deductions like PAYE, pension or National Insurance contributions.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 18 October 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 18 October 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 11 April 2015?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 11 April 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014?</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly.txt
new file mode 100644
index 00000000000..16c16bc5eab
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly.txt
@@ -0,0 +1,12 @@
+What were the employee’s total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?
+
+
+
+This is their earnings before deductions like PAYE, pension or National Insurance contributions.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.html b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.html
deleted file mode 100644
index 3d8f50398f8..00000000000
--- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How do you want the adoption pay calculated?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly_starting" />
-        Weekly starting  6 April 2015
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="usual_paydates" />
-        Based on their usual paydates
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Adoption</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=adoption">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee taking paternity leave to adopt a child?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the employee taking paternity leave to adopt a child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 18 October 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 18 October 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     6 April 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes?previous_response=2015-04-06">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 11 April 2015?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 11 April 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014?</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee’s total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?</td>
-    <td class="previous-question-body">
-    £3,000</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly?previous_response=3000.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee’s total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.txt
new file mode 100644
index 00000000000..309d2c9004e
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.txt
@@ -0,0 +1,14 @@
+How do you want the adoption pay calculated?
+
+
+
+
+
+  * weekly_starting: Weekly starting  6 April 2015
+  * usual_paydates: Based on their usual paydates
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity.html b/test/artefacts/maternity-paternity-calculator/maternity.html
deleted file mode 100644
index 34cceaa897f..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is the baby’s due date?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity.txt b/test/artefacts/maternity-paternity-calculator/maternity.txt
new file mode 100644
index 00000000000..5a75a4517c0
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity.txt
@@ -0,0 +1,12 @@
+What is the baby’s due date?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01.html
deleted file mode 100644
index 3fdac74f1f5..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the employee have an employment contract with you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01.txt
new file mode 100644
index 00000000000..562633a01f6
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01.txt
@@ -0,0 +1,14 @@
+Does the employee have an employment contract with you?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes.html
deleted file mode 100644
index 026a84fb37a..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When does the employee want to start their leave?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Based on the baby's due date, leave usually can’t start before 12 October 2014.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes.txt
new file mode 100644
index 00000000000..b7846195b3d
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes.txt
@@ -0,0 +1,12 @@
+When does the employee want to start their leave?
+
+
+
+Based on the baby's due date, leave usually can’t start before 12 October 2014.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01.html
deleted file mode 100644
index f671b19e11f..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the employee work for you on or before 29 March 2014?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01.txt
new file mode 100644
index 00000000000..f42529dc5d9
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01.txt
@@ -0,0 +1,14 @@
+Did the employee work for you on or before 29 March 2014?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes.html
deleted file mode 100644
index 145f00ae068..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Was the employee (or will they be) on your payroll on 14 September 2014?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes.txt
new file mode 100644
index 00000000000..5ac7ab9c28a
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes.txt
@@ -0,0 +1,14 @@
+Was the employee (or will they be) on your payroll on 14 September 2014?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes.html
deleted file mode 100644
index ca748417bc6..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the last normal payday on or before Saturday, 20 September 2014?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes.txt
new file mode 100644
index 00000000000..12cbce4bfe0
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes.txt
@@ -0,0 +1,12 @@
+What was the last normal payday on or before Saturday, 20 September 2014?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19.html
deleted file mode 100644
index 6e6917ae8c3..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the last normal payday before Saturday, 26 July 2014?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19.txt
new file mode 100644
index 00000000000..f9cd78ba0c3
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19.txt
@@ -0,0 +1,12 @@
+What was the last normal payday before Saturday, 26 July 2014?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24.html
deleted file mode 100644
index dc4abb85f9c..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you pay the employee?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If they’re paid irregularly choose ‘weekly’.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly" />
-        Weekly
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="every_2_weeks" />
-        Every 2 weeks
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="every_4_weeks" />
-        Every 4 weeks
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="monthly" />
-        Monthly
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Saturday, 26 July 2014?</td>
-    <td class="previous-question-body">
-    24 July 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19?previous_response=2014-07-24">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Saturday, 26 July 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24.txt
new file mode 100644
index 00000000000..b00198341cd
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24.txt
@@ -0,0 +1,16 @@
+How often do you pay the employee?
+
+
+
+If they’re paid irregularly choose ‘weekly’.
+
+  * weekly: Weekly
+  * every_2_weeks: Every 2 weeks
+  * every_4_weeks: Every 4 weeks
+  * monthly: Monthly
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates.html
deleted file mode 100644
index 052d1453866..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates.html
+++ /dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When in the month is the employee paid?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If the pay date is the 29th, 30th or 31st choose 'Last working day of the month'.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="first_day_of_the_month" />
-        First day of the month
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="last_day_of_the_month" />
-        Last day of the month
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="specific_date_each_month" />
-        Specific date each month
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="last_working_day_of_the_month" />
-        Last working day of the month
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="a_certain_week_day_each_month" />
-        A certain week day each month
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Saturday, 26 July 2014?</td>
-    <td class="previous-question-body">
-    24 July 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19?previous_response=2014-07-24">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Saturday, 26 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the SMP calculated?</td>
-    <td class="previous-question-body">
-    based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the SMP calculated?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates.txt
new file mode 100644
index 00000000000..2bf4fac9f93
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates.txt
@@ -0,0 +1,17 @@
+When in the month is the employee paid?
+
+
+
+If the pay date is the 29th, 30th or 31st choose 'Last working day of the month'.
+
+  * first_day_of_the_month: First day of the month
+  * last_day_of_the_month: Last day of the month
+  * specific_date_each_month: Specific date each month
+  * last_working_day_of_the_month: Last working day of the month
+  * a_certain_week_day_each_month: A certain week day each month
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month.html
deleted file mode 100644
index a6fec1d6ad2..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month.html
+++ /dev/null
@@ -1,266 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What particular day of the month is the employee paid?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="Sunday" />
-        Sunday
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="Monday" />
-        Monday
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="Tuesday" />
-        Tuesday
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="Wednesday" />
-        Wednesday
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="Thursday" />
-        Thursday
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="Friday" />
-        Friday
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="Saturday" />
-        Saturday
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Saturday, 26 July 2014?</td>
-    <td class="previous-question-body">
-    24 July 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19?previous_response=2014-07-24">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Saturday, 26 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the SMP calculated?</td>
-    <td class="previous-question-body">
-    based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the SMP calculated?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When in the month is the employee paid?</td>
-    <td class="previous-question-body">
-    A certain week day each month</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates?previous_response=a_certain_week_day_each_month">
-      Change<span class="visuallyhidden"> answer to "When in the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month.txt
new file mode 100644
index 00000000000..2b8cbd2cf49
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month.txt
@@ -0,0 +1,19 @@
+What particular day of the month is the employee paid?
+
+
+
+
+
+  * Sunday: Sunday
+  * Monday: Monday
+  * Tuesday: Tuesday
+  * Wednesday: Wednesday
+  * Thursday: Thursday
+  * Friday: Friday
+  * Saturday: Saturday
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month/Sunday.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month/Sunday.html
deleted file mode 100644
index 37c53ed8fd0..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month/Sunday.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month/Sunday" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the employee paid on the 1st, 2nd, 3rd, 4th or last Sunday?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="first" />
-        1st
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="second" />
-        2nd
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="third" />
-        3rd
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="fourth" />
-        4th
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="last" />
-        last
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Saturday, 26 July 2014?</td>
-    <td class="previous-question-body">
-    24 July 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19?previous_response=2014-07-24">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Saturday, 26 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the SMP calculated?</td>
-    <td class="previous-question-body">
-    based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the SMP calculated?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When in the month is the employee paid?</td>
-    <td class="previous-question-body">
-    A certain week day each month</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates?previous_response=a_certain_week_day_each_month">
-      Change<span class="visuallyhidden"> answer to "When in the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What particular day of the month is the employee paid?</td>
-    <td class="previous-question-body">
-    Sunday</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month?previous_response=Sunday">
-      Change<span class="visuallyhidden"> answer to "What particular day of the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month/Sunday.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month/Sunday.txt
new file mode 100644
index 00000000000..5460d8a41a9
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/a_certain_week_day_each_month/Sunday.txt
@@ -0,0 +1,17 @@
+Is the employee paid on the 1st, 2nd, 3rd, 4th or last Sunday?
+
+
+
+
+
+  * first: 1st
+  * second: 2nd
+  * third: 3rd
+  * fourth: 4th
+  * last: last
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/last_working_day_of_the_month.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/last_working_day_of_the_month.html
deleted file mode 100644
index 92a0108306d..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/last_working_day_of_the_month.html
+++ /dev/null
@@ -1,266 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/last_working_day_of_the_month" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What days does the employee work?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="0" />
-        Sunday
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="1" />
-        Monday
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="2" />
-        Tuesday
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="3" />
-        Wednesday
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="4" />
-        Thursday
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="5" />
-        Friday
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="checkbox" name="response[]" id="response_6" value="6" />
-        Saturday
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Saturday, 26 July 2014?</td>
-    <td class="previous-question-body">
-    24 July 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19?previous_response=2014-07-24">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Saturday, 26 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the SMP calculated?</td>
-    <td class="previous-question-body">
-    based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the SMP calculated?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When in the month is the employee paid?</td>
-    <td class="previous-question-body">
-    Last working day of the month</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates?previous_response=last_working_day_of_the_month">
-      Change<span class="visuallyhidden"> answer to "When in the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/last_working_day_of_the_month.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/last_working_day_of_the_month.txt
new file mode 100644
index 00000000000..6774f1b516a
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/last_working_day_of_the_month.txt
@@ -0,0 +1,19 @@
+What days does the employee work?
+
+
+
+
+
+  * 0: Sunday
+  * 1: Monday
+  * 2: Tuesday
+  * 3: Wednesday
+  * 4: Thursday
+  * 5: Friday
+  * 6: Saturday
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/specific_date_each_month.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/specific_date_each_month.html
deleted file mode 100644
index a5da48f89d3..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/specific_date_each_month.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/specific_date_each_month" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What specific date each month is the employee paid?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If they’re paid on the 25th enter "25". The calculator will treat an employee as paid on the last day of the month if you enter 29, 30 or 31.</p>
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Saturday, 26 July 2014?</td>
-    <td class="previous-question-body">
-    24 July 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19?previous_response=2014-07-24">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Saturday, 26 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the SMP calculated?</td>
-    <td class="previous-question-body">
-    based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the SMP calculated?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When in the month is the employee paid?</td>
-    <td class="previous-question-body">
-    Specific date each month</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates?previous_response=specific_date_each_month">
-      Change<span class="visuallyhidden"> answer to "When in the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/specific_date_each_month.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/specific_date_each_month.txt
new file mode 100644
index 00000000000..3fd77272ea6
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/monthly/100.0/usual_paydates/specific_date_each_month.txt
@@ -0,0 +1,12 @@
+What specific date each month is the employee paid?
+
+
+
+If they’re paid on the 25th enter "25". The calculator will treat an employee as paid on the last day of the month if you enter 29, 30 or 31.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly.html
deleted file mode 100644
index 4bdfed4f315..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This is their earnings before deductions like PAYE, pension or National Insurance contributions.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Saturday, 26 July 2014?</td>
-    <td class="previous-question-body">
-    24 July 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19?previous_response=2014-07-24">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Saturday, 26 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly.txt
new file mode 100644
index 00000000000..7ddf709f740
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly.txt
@@ -0,0 +1,12 @@
+What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?
+
+
+
+This is their earnings before deductions like PAYE, pension or National Insurance contributions.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.0/usual_paydates.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.0/usual_paydates.html
deleted file mode 100644
index 9079a3ac163..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.0/usual_paydates.html
+++ /dev/null
@@ -1,279 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.0/usual_paydates" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When is your employee’s next pay day on or after  1 January 2015?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Saturday, 26 July 2014?</td>
-    <td class="previous-question-body">
-    24 July 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19?previous_response=2014-07-24">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Saturday, 26 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the SMP calculated?</td>
-    <td class="previous-question-body">
-    based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the SMP calculated?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.0/usual_paydates.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.0/usual_paydates.txt
new file mode 100644
index 00000000000..da2a387b604
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.0/usual_paydates.txt
@@ -0,0 +1,12 @@
+When is your employee’s next pay day on or after  1 January 2015?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.html b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.html
deleted file mode 100644
index a1b1f9ee5fa..00000000000
--- a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How do you want the SMP calculated?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly_starting" />
-        weekly starting  1 January 2015
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="usual_paydates" />
-        based on their usual paydates
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Maternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=maternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 29 March 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 29 March 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 20 September 2014?</td>
-    <td class="previous-question-body">
-    19 September 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes?previous_response=2014-09-19">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 20 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Saturday, 26 July 2014?</td>
-    <td class="previous-question-body">
-    24 July 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19?previous_response=2014-07-24">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Saturday, 26 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee’s total earnings between Friday, 25 July 2014 and Friday, 19 September 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.txt b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.txt
new file mode 100644
index 00000000000..18568d27db2
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/maternity/2015-01-01/yes/2015-01-01/yes/yes/2014-09-19/2014-07-24/weekly/100.txt
@@ -0,0 +1,14 @@
+How do you want the SMP calculated?
+
+
+
+
+
+  * weekly_starting: weekly starting  1 January 2015
+  * usual_paydates: based on their usual paydates
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity.html b/test/artefacts/maternity-paternity-calculator/paternity.html
deleted file mode 100644
index e908c7338de..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the paternity leave or pay for an adoption?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity.txt b/test/artefacts/maternity-paternity-calculator/paternity.txt
new file mode 100644
index 00000000000..c4362bb91f2
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity.txt
@@ -0,0 +1,14 @@
+Is the paternity leave or pay for an adoption?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/no.html b/test/artefacts/maternity-paternity-calculator/paternity/no.html
deleted file mode 100644
index ec50c5462a7..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/no.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is the baby’s due date?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/no.txt b/test/artefacts/maternity-paternity-calculator/paternity/no.txt
new file mode 100644
index 00000000000..5a75a4517c0
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/no.txt
@@ -0,0 +1,12 @@
+What is the baby’s due date?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01.html b/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01.html
deleted file mode 100644
index 694dcb77c8d..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/no/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is the actual birth date?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If unknown enter the due date.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/no?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01.txt
new file mode 100644
index 00000000000..52c193cffbc
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01.txt
@@ -0,0 +1,12 @@
+What is the actual birth date?
+
+
+
+If unknown enter the due date.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01/2015-01-01.html b/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01/2015-01-01.html
deleted file mode 100644
index fcb31f43610..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01/2015-01-01.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/no/2015-01-01/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the employee responsible for the child’s upbringing and either the biological father or the mother’s husband or partner?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the baby’s due date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/no?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the baby’s due date?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is the actual birth date?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/no/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What is the actual birth date?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01/2015-01-01.txt
new file mode 100644
index 00000000000..90f9eeb161d
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/no/2015-01-01/2015-01-01.txt
@@ -0,0 +1,14 @@
+Is the employee responsible for the child’s upbringing and either the biological father or the mother’s husband or partner?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes.html b/test/artefacts/maternity-paternity-calculator/paternity/yes.html
deleted file mode 100644
index 5250661c196..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When was the child matched with the employee?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes.txt
new file mode 100644
index 00000000000..fd12da29443
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes.txt
@@ -0,0 +1,12 @@
+When was the child matched with the employee?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01.html
deleted file mode 100644
index a07c01399c2..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When will the child be placed with the employee?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01.txt
new file mode 100644
index 00000000000..cc67b12c25f
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01.txt
@@ -0,0 +1,12 @@
+When will the child be placed with the employee?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01.html
deleted file mode 100644
index 5d436153dec..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01.txt
new file mode 100644
index 00000000000..8606fa17011
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01.txt
@@ -0,0 +1,14 @@
+Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes.html
deleted file mode 100644
index 20a8e08fa1c..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the employee work for you on or before 12 July 2014?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes.txt
new file mode 100644
index 00000000000..0d7fa583ca8
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes.txt
@@ -0,0 +1,14 @@
+Did the employee work for you on or before 12 July 2014?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes.html
deleted file mode 100644
index 665c648cdf0..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the employee have an employment contract with you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes.txt
new file mode 100644
index 00000000000..562633a01f6
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes.txt
@@ -0,0 +1,14 @@
+Does the employee have an employment contract with you?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes.html
deleted file mode 100644
index be9f74c31ba..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Was the employee (or will they be) on your payroll on 14 September 2014?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes.txt
new file mode 100644
index 00000000000..5ac7ab9c28a
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes.txt
@@ -0,0 +1,14 @@
+Was the employee (or will they be) on your payroll on 14 September 2014?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes.html
deleted file mode 100644
index 8c55c6378c0..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Will the employee still be employed by you on  1 January 2015?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes.txt
new file mode 100644
index 00000000000..0214e84c15a
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes.txt
@@ -0,0 +1,14 @@
+Will the employee still be employed by you on  1 January 2015?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes.html
deleted file mode 100644
index 7ed277f08b7..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When does the employee want to start their paternity leave?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Leave cannot start before Thursday, 01 January 2015.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes.txt
new file mode 100644
index 00000000000..ff352bc9b52
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes.txt
@@ -0,0 +1,12 @@
+When does the employee want to start their paternity leave?
+
+
+
+Leave cannot start before Thursday, 01 January 2015.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01.html
deleted file mode 100644
index 8c4bbad7dce..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How long is the employee's paternity leave?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="one_week" />
-        One week
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="two_weeks" />
-        Two weeks
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01.txt
new file mode 100644
index 00000000000..63b7e4afe64
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01.txt
@@ -0,0 +1,14 @@
+How long is the employee's paternity leave?
+
+
+
+
+
+  * one_week: One week
+  * two_weeks: Two weeks
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week.html
deleted file mode 100644
index 5ef2fb20240..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week.html
+++ /dev/null
@@ -1,279 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the last normal payday on or before Saturday, 03 January 2015
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week.txt
new file mode 100644
index 00000000000..d0296b1a9cd
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week.txt
@@ -0,0 +1,12 @@
+What was the last normal payday on or before Saturday, 03 January 2015
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01.html
deleted file mode 100644
index 33e48fedd2c..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01.html
+++ /dev/null
@@ -1,290 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What was the last normal payday before Friday, 07 November 2014
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01.txt
new file mode 100644
index 00000000000..569d59e63cd
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01.txt
@@ -0,0 +1,12 @@
+What was the last normal payday before Friday, 07 November 2014
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01.html
deleted file mode 100644
index 123ad62fb07..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you pay the employee?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If they are paid irregularly choose 'weekly'.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly" />
-        Weekly
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="every_2_weeks" />
-        Every 2 weeks
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="every_4_weeks" />
-        Every 4 weeks
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="monthly" />
-        Monthly
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01.txt
new file mode 100644
index 00000000000..3ffb2ef4d87
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01.txt
@@ -0,0 +1,16 @@
+How often do you pay the employee?
+
+
+
+If they are paid irregularly choose 'weekly'.
+
+  * weekly: Weekly
+  * every_2_weeks: Every 2 weeks
+  * every_4_weeks: Every 4 weeks
+  * monthly: Monthly
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates.html
deleted file mode 100644
index f3c8592bd4f..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When in the month is the employee paid?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If the pay date is the 29th, 30th or 31st choose 'Last working day of the month'.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="first_day_of_the_month" />
-        First day of the month
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="last_day_of_the_month" />
-        Last day of the month
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="specific_date_each_month" />
-        Specific date each month
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="last_working_day_of_the_month" />
-        Last working day of the month
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="a_certain_week_day_each_month" />
-        A certain week day each month
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?</td>
-    <td class="previous-question-body">
-    £3,000</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly?previous_response=3000.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the paternity pay calculated?</td>
-    <td class="previous-question-body">
-    Based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the paternity pay calculated?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates.txt
new file mode 100644
index 00000000000..2bf4fac9f93
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates.txt
@@ -0,0 +1,17 @@
+When in the month is the employee paid?
+
+
+
+If the pay date is the 29th, 30th or 31st choose 'Last working day of the month'.
+
+  * first_day_of_the_month: First day of the month
+  * last_day_of_the_month: Last day of the month
+  * specific_date_each_month: Specific date each month
+  * last_working_day_of_the_month: Last working day of the month
+  * a_certain_week_day_each_month: A certain week day each month
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month.html
deleted file mode 100644
index 4cab0ebfd1b..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month.html
+++ /dev/null
@@ -1,321 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What particular day of the month is the employee paid?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="0" />
-        Sunday
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="1" />
-        Monday
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="2" />
-        Tuesday
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="3" />
-        Wednesday
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="4" />
-        Thursday
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="5" />
-        Friday
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="6" />
-        Saturday
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?</td>
-    <td class="previous-question-body">
-    £3,000</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly?previous_response=3000.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the paternity pay calculated?</td>
-    <td class="previous-question-body">
-    Based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the paternity pay calculated?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When in the month is the employee paid?</td>
-    <td class="previous-question-body">
-    A certain week day each month</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates?previous_response=a_certain_week_day_each_month">
-      Change<span class="visuallyhidden"> answer to "When in the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month.txt
new file mode 100644
index 00000000000..a4933337f30
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month.txt
@@ -0,0 +1,19 @@
+What particular day of the month is the employee paid?
+
+
+
+
+
+  * 0: Sunday
+  * 1: Monday
+  * 2: Tuesday
+  * 3: Wednesday
+  * 4: Thursday
+  * 5: Friday
+  * 6: Saturday
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month/0.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month/0.html
deleted file mode 100644
index e91cd2c59ad..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month/0.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month/0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the employee paid on the 1st, 2nd, 3rd, 4th or last Sunday?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="first" />
-        1st
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="second" />
-        2nd
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="third" />
-        3rd
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="fourth" />
-        4th
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="last" />
-        last
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?</td>
-    <td class="previous-question-body">
-    £3,000</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly?previous_response=3000.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the paternity pay calculated?</td>
-    <td class="previous-question-body">
-    Based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the paternity pay calculated?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When in the month is the employee paid?</td>
-    <td class="previous-question-body">
-    A certain week day each month</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates?previous_response=a_certain_week_day_each_month">
-      Change<span class="visuallyhidden"> answer to "When in the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What particular day of the month is the employee paid?</td>
-    <td class="previous-question-body">
-    Sunday</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month?previous_response=0">
-      Change<span class="visuallyhidden"> answer to "What particular day of the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month/0.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month/0.txt
new file mode 100644
index 00000000000..5460d8a41a9
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/a_certain_week_day_each_month/0.txt
@@ -0,0 +1,17 @@
+Is the employee paid on the 1st, 2nd, 3rd, 4th or last Sunday?
+
+
+
+
+
+  * first: 1st
+  * second: 2nd
+  * third: 3rd
+  * fourth: 4th
+  * last: last
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/last_working_day_of_the_month.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/last_working_day_of_the_month.html
deleted file mode 100644
index b6b9a6ddbe0..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/last_working_day_of_the_month.html
+++ /dev/null
@@ -1,321 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/last_working_day_of_the_month" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What days does the employee work?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="0" />
-        Sunday
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="1" />
-        Monday
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="2" />
-        Tuesday
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="3" />
-        Wednesday
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="4" />
-        Thursday
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="checkbox" name="response[]" id="response_5" value="5" />
-        Friday
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="checkbox" name="response[]" id="response_6" value="6" />
-        Saturday
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?</td>
-    <td class="previous-question-body">
-    £3,000</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly?previous_response=3000.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the paternity pay calculated?</td>
-    <td class="previous-question-body">
-    Based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the paternity pay calculated?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When in the month is the employee paid?</td>
-    <td class="previous-question-body">
-    Last working day of the month</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates?previous_response=last_working_day_of_the_month">
-      Change<span class="visuallyhidden"> answer to "When in the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/last_working_day_of_the_month.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/last_working_day_of_the_month.txt
new file mode 100644
index 00000000000..6774f1b516a
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/last_working_day_of_the_month.txt
@@ -0,0 +1,19 @@
+What days does the employee work?
+
+
+
+
+
+  * 0: Sunday
+  * 1: Monday
+  * 2: Tuesday
+  * 3: Wednesday
+  * 4: Thursday
+  * 5: Friday
+  * 6: Saturday
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/specific_date_each_month.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/specific_date_each_month.html
deleted file mode 100644
index abf46796d60..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/specific_date_each_month.html
+++ /dev/null
@@ -1,279 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/specific_date_each_month" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What specific date each month is the employee paid?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If they are paid on the 25th enter '25'. The calculator will treat an employee as paid on the last day of the month if you enter '29', '30' or '31'.</p>
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Monthly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01?previous_response=monthly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?</td>
-    <td class="previous-question-body">
-    £3,000</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly?previous_response=3000.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the paternity pay calculated?</td>
-    <td class="previous-question-body">
-    Based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the paternity pay calculated?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When in the month is the employee paid?</td>
-    <td class="previous-question-body">
-    Specific date each month</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates?previous_response=specific_date_each_month">
-      Change<span class="visuallyhidden"> answer to "When in the month is the employee paid?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/specific_date_each_month.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/specific_date_each_month.txt
new file mode 100644
index 00000000000..a138af401e9
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/monthly/3000.0/usual_paydates/specific_date_each_month.txt
@@ -0,0 +1,12 @@
+What specific date each month is the employee paid?
+
+
+
+If they are paid on the 25th enter '25'. The calculator will treat an employee as paid on the last day of the month if you enter '29', '30' or '31'.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly.html
deleted file mode 100644
index 40ff09b812c..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This is the earnings before deductions like PAYE, pendion or National Insurance contributions.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly.txt
new file mode 100644
index 00000000000..22db1d6c9b5
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly.txt
@@ -0,0 +1,12 @@
+What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?
+
+
+
+This is the earnings before deductions like PAYE, pendion or National Insurance contributions.
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates.html
deleted file mode 100644
index 06f2cd0583d..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates.html
+++ /dev/null
@@ -1,334 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When is your employee's next pay day on or after  1 January 2015
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?</td>
-    <td class="previous-question-body">
-    £3,000</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly?previous_response=3000.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How do you want the paternity pay calculated?</td>
-    <td class="previous-question-body">
-    Based on their usual paydates</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.0?previous_response=usual_paydates">
-      Change<span class="visuallyhidden"> answer to "How do you want the paternity pay calculated?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates.txt
new file mode 100644
index 00000000000..7de020b6283
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates.txt
@@ -0,0 +1,12 @@
+When is your employee's next pay day on or after  1 January 2015
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.html b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.html
deleted file mode 100644
index 036d55d9a91..00000000000
--- a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How do you want the paternity pay calculated?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="weekly_starting" />
-        Weekly starting  1 January 2015
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="usual_paydates" />
-        Based on their usual paydates
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/maternity-paternity-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What do you want to check?</td>
-    <td class="previous-question-body">
-    Paternity</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y?previous_response=paternity">
-      Change<span class="visuallyhidden"> answer to "What do you want to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the paternity leave or pay for an adoption?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the paternity leave or pay for an adoption?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was the child matched with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When was the child matched with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child be placed with the employee?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When will the child be placed with the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the employee work for you on or before 12 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the employee work for you on or before 12 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Does the employee have an employment contract with you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Does the employee have an employment contract with you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the employee (or will they be) on your payroll on 14 September 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the employee (or will they be) on your payroll on 14 September 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Will the employee still be employed by you on  1 January 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will the employee still be employed by you on  1 January 2015?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When does the employee want to start their paternity leave?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When does the employee want to start their paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long is the employee's paternity leave?</td>
-    <td class="previous-question-body">
-    One week</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01?previous_response=one_week">
-      Change<span class="visuallyhidden"> answer to "How long is the employee's paternity leave?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday on or before Saturday, 03 January 2015</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday on or before Saturday, 03 January 2015"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What was the last normal payday before Friday, 07 November 2014</td>
-    <td class="previous-question-body">
-     1 November 2014</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01?previous_response=2014-11-01">
-      Change<span class="visuallyhidden"> answer to "What was the last normal payday before Friday, 07 November 2014"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the employee?</td>
-    <td class="previous-question-body">
-    Weekly</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01?previous_response=weekly">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the employee?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?</td>
-    <td class="previous-question-body">
-    £3,000</td>
-
-  <td class="link-right">
-    <a href="/maternity-paternity-calculator/y/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly?previous_response=3000.0">
-      Change<span class="visuallyhidden"> answer to "What were the employee's total earnings between Sunday, 02 November 2014 and Thursday, 01 January 2015?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.txt b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.txt
new file mode 100644
index 00000000000..061616fa155
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/paternity/yes/2015-01-01/2015-01-01/yes/yes/yes/yes/yes/2015-01-01/one_week/2015-01-01/2014-11-01/weekly/3000.txt
@@ -0,0 +1,14 @@
+How do you want the paternity pay calculated?
+
+
+
+
+
+  * weekly_starting: Weekly starting  1 January 2015
+  * usual_paydates: Based on their usual paydates
+
+
+
+
+
+
diff --git a/test/artefacts/maternity-paternity-calculator/y.html b/test/artefacts/maternity-paternity-calculator/y.html
deleted file mode 100644
index 07c9e5579d1..00000000000
--- a/test/artefacts/maternity-paternity-calculator/y.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Maternity and paternity calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Maternity and paternity calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/maternity-paternity-calculator/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What do you want to check?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="maternity" />
-        Maternity
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="paternity" />
-        Paternity
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="adoption" />
-        Adoption
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/maternity-paternity-calculator/y.txt b/test/artefacts/maternity-paternity-calculator/y.txt
new file mode 100644
index 00000000000..386c6fd41ef
--- /dev/null
+++ b/test/artefacts/maternity-paternity-calculator/y.txt
@@ -0,0 +1,15 @@
+What do you want to check?
+
+
+
+
+
+  * maternity: Maternity
+  * paternity: Paternity
+  * adoption: Adoption
+
+
+
+
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment.html b/test/artefacts/minimum-wage-calculator-employers/current_payment.html
deleted file mode 100644
index e6627864d3b..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the worker an apprentice?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If they’re 19 or over and past their first year they don’t count as an apprentice for minimum wage purposes.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="not_an_apprentice" />
-        Not an apprentice
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="apprentice_under_19" />
-        Apprentice under 19
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="apprentice_over_19_first_year" />
-        Apprentice aged 19 and over in their first year
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="apprentice_over_19_second_year_onwards" />
-        Apprentice 19 and over in their second year or onwards
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment.txt
new file mode 100644
index 00000000000..f84dd8008f1
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment.txt
@@ -0,0 +1,16 @@
+Is the worker an apprentice?
+
+
+
+If they’re 19 or over and past their first year they don’t count as an apprentice for minimum wage purposes.
+
+  * not_an_apprentice: Not an apprentice
+  * apprentice_under_19: Apprentice under 19
+  * apprentice_over_19_first_year: Apprentice aged 19 and over in their first year
+  * apprentice_over_19_second_year_onwards: Apprentice 19 and over in their second year or onwards
+
+
+
+
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.html
deleted file mode 100644
index 6caccfd3753..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old is the worker?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />years old</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the worker an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Is the worker an apprentice?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.txt
new file mode 100644
index 00000000000..ac3f2ccd4f2
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice.txt
@@ -0,0 +1,12 @@
+How old is the worker?
+
+
+
+
+
+
+
+
+years old
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.html
deleted file mode 100644
index a68e550cf48..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often do you pay the worker?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>This is the pay period.</p>
-
-
-      </article>
-
-      <p class="hint">You pay the worker every</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />days</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the worker an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Is the worker an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old is the worker?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old is the worker?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.txt
new file mode 100644
index 00000000000..7177869dcc1
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25.txt
@@ -0,0 +1,13 @@
+How often do you pay the worker?
+
+This is the pay period.
+
+
+You pay the worker every
+
+
+
+
+days
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.html
deleted file mode 100644
index bc6b5e515b7..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours does the worker work during the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Don’t include any overtime or other extra hours the worker might work.</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />hours</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the worker an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Is the worker an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old is the worker?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old is the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.txt
new file mode 100644
index 00000000000..252d42dcf5f
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1.txt
@@ -0,0 +1,12 @@
+How many hours does the worker work during the pay period?
+
+
+
+Don’t include any overtime or other extra hours the worker might work.
+
+
+
+
+hours
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html
deleted file mode 100644
index 9f859178044..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you charge for accommodation per day?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per day</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the worker an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Is the worker an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old is the worker?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old is the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you provide accommodation?</td>
-    <td class="previous-question-body">
-    Yes, the accommodation is charged for</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0?previous_response=yes_charged">
-      Change<span class="visuallyhidden"> answer to "Do you provide accommodation?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.txt
new file mode 100644
index 00000000000..4f2d69cc983
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_charged.txt
@@ -0,0 +1,12 @@
+How much do you charge for accommodation per day?
+
+
+
+
+
+
+
+
+per day
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html
deleted file mode 100644
index 344f1857a6d..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many days per week does the worker live in the accommodation?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />days per week</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the worker an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Is the worker an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old is the worker?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old is the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you provide accommodation?</td>
-    <td class="previous-question-body">
-    Yes, the accommodation is free</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0?previous_response=yes_free">
-      Change<span class="visuallyhidden"> answer to "Do you provide accommodation?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.txt
new file mode 100644
index 00000000000..b60100861b1
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0/yes_free.txt
@@ -0,0 +1,12 @@
+How many days per week does the worker live in the accommodation?
+
+
+
+
+
+
+
+
+days per week
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html
deleted file mode 100644
index 9994b4dc939..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0/0.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you provide accommodation?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="no" />
-        No
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="yes_free" />
-        Yes, the accommodation is free
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="yes_charged" />
-        Yes, the accommodation is charged for
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the worker an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Is the worker an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old is the worker?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old is the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.txt
new file mode 100644
index 00000000000..2d9bde427a5
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/0.txt
@@ -0,0 +1,15 @@
+Do you provide accommodation?
+
+
+
+
+
+  * no: No
+  * yes_free: Yes, the accommodation is free
+  * yes_charged: Yes, the accommodation is charged for
+
+
+
+
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html
deleted file mode 100644
index 75bd94f9fbc..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0/8.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you pay the worker for overtime per hour?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per hour</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the worker an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Is the worker an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old is the worker?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old is the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    8.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0?previous_response=8.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.txt
new file mode 100644
index 00000000000..03be909f1f9
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.0/8.txt
@@ -0,0 +1,12 @@
+How much do you pay the worker for overtime per hour?
+
+
+
+
+
+
+
+
+per hour
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.html
deleted file mode 100644
index 40196fb193e..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0/100.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours of overtime does the worker work during the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If they don’t work overtime enter 0</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />hours</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the worker an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Is the worker an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old is the worker?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old is the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much do you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.txt
new file mode 100644
index 00000000000..a7a45418083
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.0/100.txt
@@ -0,0 +1,12 @@
+How many hours of overtime does the worker work during the pay period?
+
+
+
+If they don’t work overtime enter 0
+
+
+
+
+hours
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.html b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.html
deleted file mode 100644
index 1312f15bac6..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1/16.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you pay the worker in the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Don’t include payments for overtime or anything extra to their pay, eg money for clothes or goods.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />in the pay period</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you’re paying a worker the National Minimum Wage or the National Living Wage</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=current_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the worker an apprentice?</td>
-    <td class="previous-question-body">
-    Not an apprentice</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment?previous_response=not_an_apprentice">
-      Change<span class="visuallyhidden"> answer to "Is the worker an apprentice?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old is the worker?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old is the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often do you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often do you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours does the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/current_payment/not_an_apprentice/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours does the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.txt b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.txt
new file mode 100644
index 00000000000..c7aa775a949
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/current_payment/not_an_apprentice/25/1/16.txt
@@ -0,0 +1,12 @@
+How much do you pay the worker in the pay period?
+
+
+
+Don’t include payments for overtime or anything extra to their pay, eg money for clothes or goods.
+
+
+
+
+in the pay period
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment.html b/test/artefacts/minimum-wage-calculator-employers/past_payment.html
deleted file mode 100644
index a50ba8a51b6..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which year would you like to check past payments for?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You can go back up to 6 years</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="2015-10-01" />
-        Oct 2015 - Mar 2016
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="2014-10-01" />
-        Oct 2014 - Sep 2015
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="2013-10-01" />
-        Oct 2013 - Sep 2014
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="2012-10-01" />
-        Oct 2012 - Sep 2013
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="2011-10-01" />
-        Oct 2011 - Sep 2012
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="2010-10-01" />
-        Oct 2010 - Sep 2011
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="2009-10-01" />
-        Oct 2009 - Sep 2010
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment.txt
new file mode 100644
index 00000000000..82186ac8da4
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment.txt
@@ -0,0 +1,19 @@
+Which year would you like to check past payments for?
+
+
+
+You can go back up to 6 years
+
+  * 2015-10-01: Oct 2015 - Mar 2016
+  * 2014-10-01: Oct 2014 - Sep 2015
+  * 2013-10-01: Oct 2013 - Sep 2014
+  * 2012-10-01: Oct 2012 - Sep 2013
+  * 2011-10-01: Oct 2011 - Sep 2012
+  * 2010-10-01: Oct 2010 - Sep 2011
+  * 2009-10-01: Oct 2009 - Sep 2010
+
+
+
+
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01.html
deleted file mode 100644
index 55280403bd9..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Was the worker an apprentice at the time?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="no" />
-        No
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="apprentice_under_19" />
-        Apprentice under 19
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="apprentice_over_19" />
-        Apprentice aged 19 and over and in their first year
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01.txt
new file mode 100644
index 00000000000..5a9a51f60c0
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01.txt
@@ -0,0 +1,15 @@
+Was the worker an apprentice at the time?
+
+
+
+
+
+  * no: No
+  * apprentice_under_19: Apprentice under 19
+  * apprentice_over_19: Apprentice aged 19 and over and in their first year
+
+
+
+
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no.html
deleted file mode 100644
index 53a2ca6efe8..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old was the worker at the time?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />years old</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the worker an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Was the worker an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no.txt
new file mode 100644
index 00000000000..9714260dc6f
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no.txt
@@ -0,0 +1,12 @@
+How old was the worker at the time?
+
+
+
+
+
+
+
+
+years old
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25.html
deleted file mode 100644
index b3783b1549a..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How often did you pay the worker?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>This is the pay period.</p>
-
-
-      </article>
-
-      <p class="hint">You pay the worker every</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />days</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the worker an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Was the worker an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was the worker at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old was the worker at the time?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25.txt
new file mode 100644
index 00000000000..6845aa736c5
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25.txt
@@ -0,0 +1,13 @@
+How often did you pay the worker?
+
+This is the pay period.
+
+
+You pay the worker every
+
+
+
+
+days
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1.html
deleted file mode 100644
index 22f88b9bffd..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours did the worker work during the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Don’t include any overtime or other extra hours the worker worked.</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />hours</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the worker an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Was the worker an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was the worker at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old was the worker at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1.txt
new file mode 100644
index 00000000000..dd182e45fa0
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1.txt
@@ -0,0 +1,12 @@
+How many hours did the worker work during the pay period?
+
+
+
+Don’t include any overtime or other extra hours the worker worked.
+
+
+
+
+hours
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
deleted file mode 100644
index 6e868809e4e..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much did you charge for accommodation per day?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per day</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the worker an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Was the worker an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was the worker at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old was the worker at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much did you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much did you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you provide accommodation?</td>
-    <td class="previous-question-body">
-    Yes, the accommodation was charged for</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0?previous_response=yes_charged">
-      Change<span class="visuallyhidden"> answer to "Did you provide accommodation?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.txt
new file mode 100644
index 00000000000..540eb81b7cd
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_charged.txt
@@ -0,0 +1,12 @@
+How much did you charge for accommodation per day?
+
+
+
+
+
+
+
+
+per day
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
deleted file mode 100644
index ca884a315dd..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many days per week did the worker live in the accommodation?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />days per week</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the worker an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Was the worker an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was the worker at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old was the worker at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much did you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much did you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you provide accommodation?</td>
-    <td class="previous-question-body">
-    Yes, the accommodation was free</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0?previous_response=yes_free">
-      Change<span class="visuallyhidden"> answer to "Did you provide accommodation?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.txt
new file mode 100644
index 00000000000..0ff5044ceaf
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0/yes_free.txt
@@ -0,0 +1,12 @@
+How many days per week did the worker live in the accommodation?
+
+
+
+
+
+
+
+
+days per week
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.html
deleted file mode 100644
index 0cf84f4dfa0..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0/0.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did you provide accommodation?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="no" />
-        No
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="yes_free" />
-        Yes, the accommodation was free
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="yes_charged" />
-        Yes, the accommodation was charged for
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the worker an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Was the worker an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was the worker at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old was the worker at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much did you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much did you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    0.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0?previous_response=0.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.txt
new file mode 100644
index 00000000000..0f4d8453074
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/0.txt
@@ -0,0 +1,15 @@
+Did you provide accommodation?
+
+
+
+
+
+  * no: No
+  * yes_free: Yes, the accommodation was free
+  * yes_charged: Yes, the accommodation was charged for
+
+
+
+
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/8.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/8.html
deleted file mode 100644
index f08044384ac..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/8.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0/8.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much did you pay the worker for overtime per hour?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />per hour</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the worker an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Was the worker an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was the worker at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old was the worker at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much did you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much did you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours of overtime did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    8.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0?previous_response=8.0">
-      Change<span class="visuallyhidden"> answer to "How many hours of overtime did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/8.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/8.txt
new file mode 100644
index 00000000000..9bb76d76bbb
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.0/8.txt
@@ -0,0 +1,12 @@
+How much did you pay the worker for overtime per hour?
+
+
+
+
+
+
+
+
+per hour
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.html
deleted file mode 100644
index a469317114f..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0/100.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many hours of overtime did the worker work during the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If they didn’t work overtime enter 0</p>
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />hours</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the worker an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Was the worker an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was the worker at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old was the worker at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much did you pay the worker in the pay period?</td>
-    <td class="previous-question-body">
-    £100</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0?previous_response=100.0">
-      Change<span class="visuallyhidden"> answer to "How much did you pay the worker in the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.txt
new file mode 100644
index 00000000000..c1a31d66580
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.0/100.txt
@@ -0,0 +1,12 @@
+How many hours of overtime did the worker work during the pay period?
+
+
+
+If they didn’t work overtime enter 0
+
+
+
+
+hours
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.html b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.html
deleted file mode 100644
index bb3bac63938..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1/16.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much did you pay the worker in the pay period?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Don’t include payments for overtime or anything extra to their pay, eg money for clothes or goods.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" />in the pay period</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/minimum-wage-calculator-employers">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to check?</td>
-    <td class="previous-question-body">
-    If you owe a worker past payments (before April 2016)</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y?previous_response=past_payment">
-      Change<span class="visuallyhidden"> answer to "What would you like to check?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which year would you like to check past payments for?</td>
-    <td class="previous-question-body">
-    Oct 2015 - Mar 2016</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment?previous_response=2015-10-01">
-      Change<span class="visuallyhidden"> answer to "Which year would you like to check past payments for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the worker an apprentice at the time?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Was the worker an apprentice at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How old was the worker at the time?</td>
-    <td class="previous-question-body">
-    25</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no?previous_response=25">
-      Change<span class="visuallyhidden"> answer to "How old was the worker at the time?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How often did you pay the worker?</td>
-    <td class="previous-question-body">
-    1</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25?previous_response=1">
-      Change<span class="visuallyhidden"> answer to "How often did you pay the worker?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many hours did the worker work during the pay period?</td>
-    <td class="previous-question-body">
-    16.0</td>
-
-  <td class="link-right">
-    <a href="/minimum-wage-calculator-employers/y/past_payment/2015-10-01/no/25/1?previous_response=16.0">
-      Change<span class="visuallyhidden"> answer to "How many hours did the worker work during the pay period?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.txt b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.txt
new file mode 100644
index 00000000000..7857b7bd239
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/past_payment/2015-10-01/no/25/1/16.txt
@@ -0,0 +1,12 @@
+How much did you pay the worker in the pay period?
+
+
+
+Don’t include payments for overtime or anything extra to their pay, eg money for clothes or goods.
+
+
+
+
+in the pay period
+
+
diff --git a/test/artefacts/minimum-wage-calculator-employers/y.html b/test/artefacts/minimum-wage-calculator-employers/y.html
deleted file mode 100644
index 06c6be32313..00000000000
--- a/test/artefacts/minimum-wage-calculator-employers/y.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Minimum wage calculator for employers - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Minimum wage calculator for employers
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/minimum-wage-calculator-employers/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What would you like to check?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="current_payment" />
-        If you’re paying a worker the National Minimum Wage or the National Living Wage
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="past_payment" />
-        If you owe a worker past payments (before April 2016)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/minimum-wage-calculator-employers/y.txt b/test/artefacts/minimum-wage-calculator-employers/y.txt
new file mode 100644
index 00000000000..86007dfd257
--- /dev/null
+++ b/test/artefacts/minimum-wage-calculator-employers/y.txt
@@ -0,0 +1,14 @@
+What would you like to check?
+
+
+
+
+
+  * current_payment: If you’re paying a worker the National Minimum Wage or the National Living Wage
+  * past_payment: If you owe a worker past payments (before April 2016)
+
+
+
+
+
+
diff --git a/test/artefacts/overseas-passports/afghanistan.html b/test/artefacts/overseas-passports/afghanistan.html
deleted file mode 100644
index c31e3bbaee5..00000000000
--- a/test/artefacts/overseas-passports/afghanistan.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Overseas British passport applications - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Overseas British passport applications
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/overseas-passports/y/afghanistan" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you renewing, replacing or applying for a first passport?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="renewing_new" />
-        Renewing a red passport
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="renewing_old" />
-        Renewing an old black or blue passport
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="applying" />
-        Applying for a first passport
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="replacing" />
-        Replacing a lost or stolen passport
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/overseas-passports">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which country or territory are you in?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/overseas-passports/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country or territory are you in?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/overseas-passports/afghanistan.txt b/test/artefacts/overseas-passports/afghanistan.txt
new file mode 100644
index 00000000000..a3d95041511
--- /dev/null
+++ b/test/artefacts/overseas-passports/afghanistan.txt
@@ -0,0 +1,16 @@
+Are you renewing, replacing or applying for a first passport?
+
+
+
+
+
+  * renewing_new: Renewing a red passport
+  * renewing_old: Renewing an old black or blue passport
+  * applying: Applying for a first passport
+  * replacing: Replacing a lost or stolen passport
+
+
+
+
+
+
diff --git a/test/artefacts/overseas-passports/afghanistan/renewing_new.html b/test/artefacts/overseas-passports/afghanistan/renewing_new.html
deleted file mode 100644
index 1c50a59ffda..00000000000
--- a/test/artefacts/overseas-passports/afghanistan/renewing_new.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Overseas British passport applications - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Overseas British passport applications
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/overseas-passports/y/afghanistan/renewing_new" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you need an adult or child passport?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="adult" />
-        Adult (aged 16 and over)
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="child" />
-        Child (aged 15 or under)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/overseas-passports">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which country or territory are you in?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/overseas-passports/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country or territory are you in?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you renewing, replacing or applying for a first passport?</td>
-    <td class="previous-question-body">
-    Renewing a red passport</td>
-
-  <td class="link-right">
-    <a href="/overseas-passports/y/afghanistan?previous_response=renewing_new">
-      Change<span class="visuallyhidden"> answer to "Are you renewing, replacing or applying for a first passport?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/overseas-passports/afghanistan/renewing_new.txt b/test/artefacts/overseas-passports/afghanistan/renewing_new.txt
new file mode 100644
index 00000000000..d7423dacf90
--- /dev/null
+++ b/test/artefacts/overseas-passports/afghanistan/renewing_new.txt
@@ -0,0 +1,14 @@
+Do you need an adult or child passport?
+
+
+
+
+
+  * adult: Adult (aged 16 and over)
+  * child: Child (aged 15 or under)
+
+
+
+
+
+
diff --git a/test/artefacts/overseas-passports/afghanistan/renewing_old/adult.html b/test/artefacts/overseas-passports/afghanistan/renewing_old/adult.html
deleted file mode 100644
index 92d287b0da8..00000000000
--- a/test/artefacts/overseas-passports/afghanistan/renewing_old/adult.html
+++ /dev/null
@@ -1,350 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Overseas British passport applications - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Overseas British passport applications
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/overseas-passports/y/afghanistan/renewing_old/adult" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which country were you born in?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-guiana">French Guiana</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guadeloupe">Guadeloupe</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="martinique">Martinique</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mayotte">Mayotte</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="reunion">Reunion</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="the-occupied-palestinian-territories">The Occupied Palestinian Territories</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="united-kingdom">United Kingdom</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/overseas-passports">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which country or territory are you in?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/overseas-passports/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country or territory are you in?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you renewing, replacing or applying for a first passport?</td>
-    <td class="previous-question-body">
-    Renewing an old black or blue passport</td>
-
-  <td class="link-right">
-    <a href="/overseas-passports/y/afghanistan?previous_response=renewing_old">
-      Change<span class="visuallyhidden"> answer to "Are you renewing, replacing or applying for a first passport?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you need an adult or child passport?</td>
-    <td class="previous-question-body">
-    Adult (aged 16 and over)</td>
-
-  <td class="link-right">
-    <a href="/overseas-passports/y/afghanistan/renewing_old?previous_response=adult">
-      Change<span class="visuallyhidden"> answer to "Do you need an adult or child passport?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/overseas-passports/afghanistan/renewing_old/adult.txt b/test/artefacts/overseas-passports/afghanistan/renewing_old/adult.txt
new file mode 100644
index 00000000000..d6b5b73857b
--- /dev/null
+++ b/test/artefacts/overseas-passports/afghanistan/renewing_old/adult.txt
@@ -0,0 +1,239 @@
+Which country were you born in?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-guiana: French Guiana
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guadeloupe: Guadeloupe
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * martinique: Martinique
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mayotte: Mayotte
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * reunion: Reunion
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * the-occupied-palestinian-territories: The Occupied Palestinian Territories
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * united-kingdom: United Kingdom
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/overseas-passports/the-occupied-palestinian-territories.html b/test/artefacts/overseas-passports/the-occupied-palestinian-territories.html
deleted file mode 100644
index 4d8fbaaeca7..00000000000
--- a/test/artefacts/overseas-passports/the-occupied-palestinian-territories.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Overseas British passport applications - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Overseas British passport applications
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/overseas-passports/y/the-occupied-palestinian-territories" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Where are you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="gaza" />
-        Gaza
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="jerusalem-or-westbank" />
-        Jerusalem and the West Bank
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/overseas-passports">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which country or territory are you in?</td>
-    <td class="previous-question-body">
-    The Occupied Palestinian Territories</td>
-
-  <td class="link-right">
-    <a href="/overseas-passports/y?previous_response=the-occupied-palestinian-territories">
-      Change<span class="visuallyhidden"> answer to "Which country or territory are you in?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/overseas-passports/the-occupied-palestinian-territories.txt b/test/artefacts/overseas-passports/the-occupied-palestinian-territories.txt
new file mode 100644
index 00000000000..c3968e97ad1
--- /dev/null
+++ b/test/artefacts/overseas-passports/the-occupied-palestinian-territories.txt
@@ -0,0 +1,14 @@
+Where are you?
+
+
+
+
+
+  * gaza: Gaza
+  * jerusalem-or-westbank: Jerusalem and the West Bank
+
+
+
+
+
+
diff --git a/test/artefacts/overseas-passports/y.html b/test/artefacts/overseas-passports/y.html
deleted file mode 100644
index 33da836391b..00000000000
--- a/test/artefacts/overseas-passports/y.html
+++ /dev/null
@@ -1,302 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Overseas British passport applications - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Overseas British passport applications
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/overseas-passports/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which country or territory are you in?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-guiana">French Guiana</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guadeloupe">Guadeloupe</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="martinique">Martinique</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mayotte">Mayotte</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="reunion">Reunion</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="the-occupied-palestinian-territories">The Occupied Palestinian Territories</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/overseas-passports/y.txt b/test/artefacts/overseas-passports/y.txt
new file mode 100644
index 00000000000..0cd0fe2808f
--- /dev/null
+++ b/test/artefacts/overseas-passports/y.txt
@@ -0,0 +1,238 @@
+Which country or territory are you in?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-guiana: French Guiana
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guadeloupe: Guadeloupe
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * martinique: Martinique
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mayotte: Mayotte
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * reunion: Reunion
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * the-occupied-palestinian-territories: The Occupied Palestinian Territories
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/pay-leave-for-parents/y.html b/test/artefacts/pay-leave-for-parents/y.html
deleted file mode 100644
index 236a6aa3f13..00000000000
--- a/test/artefacts/pay-leave-for-parents/y.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Will you care for the child with a partner?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      <p>The partner must be one of the following:</p>
-
-<ul>
-  <li>your husband, wife, civil partner or joint adopter</li>
-  <li>the child’s other parent</li>
-  <li>your partner (if they live with you and the child)</li>
-</ul>
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/y.txt b/test/artefacts/pay-leave-for-parents/y.txt
new file mode 100644
index 00000000000..ebee79cac18
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/y.txt
@@ -0,0 +1,19 @@
+Will you care for the child with a partner?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+The partner must be one of the following:
+
+- your husband, wife, civil partner or joint adopter
+- the child’s other parent
+- your partner (if they live with you and the child)
+
diff --git a/test/artefacts/pay-leave-for-parents/yes.html b/test/artefacts/pay-leave-for-parents/yes.html
deleted file mode 100644
index 8a499ef11ac..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When is the baby due?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes.txt b/test/artefacts/pay-leave-for-parents/yes.txt
new file mode 100644
index 00000000000..826d7466e37
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes.txt
@@ -0,0 +1,12 @@
+When is the baby due?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01.html
deleted file mode 100644
index 48a4612749d..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What’s the employment status of the mother?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="employee" />
-        Employee
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="worker" />
-        Worker or agency worker
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="self-employed" />
-        Self-employed
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="unemployed" />
-        Unemployed
-      </label>
-    </li>
-</ul>
-
-
-      <p>Read about <a href="/employment-status">employment statuses</a> if you aren’t sure which one applies.</p>
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01.txt
new file mode 100644
index 00000000000..338fe87e06e
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01.txt
@@ -0,0 +1,17 @@
+What’s the employment status of the mother?
+
+
+
+
+
+  * employee: Employee
+  * worker: Worker or agency worker
+  * self-employed: Self-employed
+  * unemployed: Unemployed
+
+
+
+
+
+Read about [employment statuses](/employment-status) if you aren’t sure which one applies.
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee.html
deleted file mode 100644
index 0b9a3d7786a..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What’s the employment status of the mother’s partner?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="employee" />
-        Employee
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="worker" />
-        Worker or agency worker
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="self-employed" />
-        Self-employed
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="unemployed" />
-        Unemployed
-      </label>
-    </li>
-</ul>
-
-
-      <p>Read about <a href="/employment-status">employment statuses</a> if you aren’t sure which one applies.</p>
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee.txt
new file mode 100644
index 00000000000..fa97e993871
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee.txt
@@ -0,0 +1,17 @@
+What’s the employment status of the mother’s partner?
+
+
+
+
+
+  * employee: Employee
+  * worker: Worker or agency worker
+  * self-employed: Self-employed
+  * unemployed: Unemployed
+
+
+
+
+
+Read about [employment statuses](/employment-status) if you aren’t sure which one applies.
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee.html
deleted file mode 100644
index df52202e8a6..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the mother start her current or most recent job before 30 April 2011?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee.txt
new file mode 100644
index 00000000000..f11394f070c
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee.txt
@@ -0,0 +1,14 @@
+Did the mother start her current or most recent job before 30 April 2011?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes.html
deleted file mode 100644
index 5b6abdc270c..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Was the mother (or will she be) still working in that job on 16 October 2011?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes.txt
new file mode 100644
index 00000000000..9ae0152c083
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes.txt
@@ -0,0 +1,14 @@
+Was the mother (or will she be) still working in that job on 16 October 2011?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes.html
deleted file mode 100644
index fc79e7262f7..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much does the mother earn (or did she earn, if she’s left her job)?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-  <label for="response_amount">
-    &pound; <input type="text" name="response[amount]" id="response_amount" size="5" />
-  </label>
-  <label for="response_period">
-  per <select name="response[period]">
-    <option value="week">week</option>
-<option value="month">month</option>
-<option value="year">year</option>
-  </select>
-  </label>
-</fieldset>
-
-
-      <p>This is her total take-home pay before any deductions, eg tax.</p>
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes.txt
new file mode 100644
index 00000000000..b5c292d005b
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes.txt
@@ -0,0 +1,13 @@
+How much does the mother earn (or did she earn, if she’s left her job)?
+
+
+
+
+
+
+
+
+
+
+This is her total take-home pay before any deductions, eg tax.
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000-year.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000-year.html
deleted file mode 100644
index ee0805b113d..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000-year.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000-year.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000-year.txt
new file mode 100644
index 00000000000..d0635812483
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000-year.txt
@@ -0,0 +1,14 @@
+Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no.html
deleted file mode 100644
index 5becb691c2b..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the mother work (or will she have worked) for at least 26 weeks between 24 October 2010 and 28 January 2012?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      <p>The 26 weeks don’t need to be in a row. They can be full or part weeks.</p>
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no.txt
new file mode 100644
index 00000000000..0ce4ec799b6
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no.txt
@@ -0,0 +1,15 @@
+Did the mother work (or will she have worked) for at least 26 weeks between 24 October 2010 and 28 January 2012?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+The 26 weeks don’t need to be in a row. They can be full or part weeks.
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes.html
deleted file mode 100644
index 22a6527be45..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the mother earn (or will she have earned) a total of £390 or more in any 13 weeks between 24 October 2010 and 28 January 2012?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      <p>The 13 weeks don’t need to be in a row.</p>
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother work (or will she have worked) for at least 26 weeks between 24 October 2010 and 28 January 2012?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother work (or will she have worked) for at least 26 weeks between 24 October 2010 and 28 January 2012?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes.txt
new file mode 100644
index 00000000000..b0ee11ecaef
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes.txt
@@ -0,0 +1,15 @@
+Did the mother earn (or will she have earned) a total of £390 or more in any 13 weeks between 24 October 2010 and 28 January 2012?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+The 13 weeks don’t need to be in a row.
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes/yes.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes/yes.html
deleted file mode 100644
index 1df279302be..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes/yes.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much did the mother earn between 24 October 2010 and 28 January 2012?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-  <label for="response_amount">
-    &pound; <input type="text" name="response[amount]" id="response_amount" size="5" />
-  </label>
-  <label for="response_period">
-  per <select name="response[period]">
-    <option value="week">week</option>
-<option value="month">month</option>
-<option value="year">year</option>
-  </select>
-  </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother work (or will she have worked) for at least 26 weeks between 24 October 2010 and 28 January 2012?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother work (or will she have worked) for at least 26 weeks between 24 October 2010 and 28 January 2012?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother earn (or will she have earned) a total of £390 or more in any 13 weeks between 24 October 2010 and 28 January 2012?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother earn (or will she have earned) a total of £390 or more in any 13 weeks between 24 October 2010 and 28 January 2012?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes/yes.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes/yes.txt
new file mode 100644
index 00000000000..312c025c96c
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/no/yes/yes.txt
@@ -0,0 +1,12 @@
+How much did the mother earn between 24 October 2010 and 28 January 2012?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes.html
deleted file mode 100644
index 2631a334324..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the mother’s partner start their current or most recent job before 30 April 2011?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes.txt
new file mode 100644
index 00000000000..06ff9f9d1c0
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes.txt
@@ -0,0 +1,14 @@
+Did the mother’s partner start their current or most recent job before 30 April 2011?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes.html
deleted file mode 100644
index 5be4c62a372..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Was the mother’s partner (or will they be) still working in that job on 16 October 2011?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother’s partner start their current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother’s partner start their current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes.txt
new file mode 100644
index 00000000000..8a4575039a1
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes.txt
@@ -0,0 +1,14 @@
+Was the mother’s partner (or will they be) still working in that job on 16 October 2011?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes.html
deleted file mode 100644
index f431d30d093..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much does the mother’s partner earn (or did they earn, if they’ve left their job)?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-  <label for="response_amount">
-    &pound; <input type="text" name="response[amount]" id="response_amount" size="5" />
-  </label>
-  <label for="response_period">
-  per <select name="response[period]">
-    <option value="week">week</option>
-<option value="month">month</option>
-<option value="year">year</option>
-  </select>
-  </label>
-</fieldset>
-
-
-      <p>This is their total take-home pay before any deductions, eg tax.</p>
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother’s partner start their current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother’s partner start their current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother’s partner (or will they be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother’s partner (or will they be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes.txt
new file mode 100644
index 00000000000..8a5ef59f238
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes.txt
@@ -0,0 +1,13 @@
+How much does the mother’s partner earn (or did they earn, if they’ve left their job)?
+
+
+
+
+
+
+
+
+
+
+This is their total take-home pay before any deductions, eg tax.
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000-year.html b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000-year.html
deleted file mode 100644
index 928310dbc3e..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000-year.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Has the mother’s partner earned (or will they have earned) more than £112 per week between 27 August 2011 and 22 October 2011?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     1 February 2012</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2012-02-01">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Has the mother earned (or will she have earned) more than £112 per week between 27 August 2011 and 22 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother’s partner start their current or most recent job before 30 April 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother’s partner start their current or most recent job before 30 April 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother’s partner (or will they be) still working in that job on 16 October 2011?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother’s partner (or will they be) still working in that job on 16 October 2011?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother’s partner earn (or did they earn, if they’ve left their job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother’s partner earn (or did they earn, if they’ve left their job)?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000-year.txt b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000-year.txt
new file mode 100644
index 00000000000..778a70ea272
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2012-02-01/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000-year.txt
@@ -0,0 +1,14 @@
+Has the mother’s partner earned (or will they have earned) more than £112 per week between 27 August 2011 and 22 October 2011?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no.html b/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no.html
deleted file mode 100644
index 1dbe2beae6a..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the mother’s partner work (or will they have worked) for at least 26 weeks between 29 December 2013 and  4 April 2015?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      <p>The 26 weeks don’t need to be in a row. They can be full or part weeks.</p>
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before  5 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before  5 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother earned (or will she have earned) more than £111 per week between  1 November 2014 and 27 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Has the mother earned (or will she have earned) more than £111 per week between  1 November 2014 and 27 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother’s partner start their current or most recent job before  5 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother’s partner start their current or most recent job before  5 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother’s partner (or will they be) still working in that job on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother’s partner (or will they be) still working in that job on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother’s partner earn (or did they earn, if they’ve left their job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother’s partner earn (or did they earn, if they’ve left their job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother’s partner earned (or will they have earned) more than £111 per week between  1 November 2014 and 27 December 2014?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Has the mother’s partner earned (or will they have earned) more than £111 per week between  1 November 2014 and 27 December 2014?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no.txt b/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no.txt
new file mode 100644
index 00000000000..cb1ebbd9515
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no.txt
@@ -0,0 +1,15 @@
+Did the mother’s partner work (or will they have worked) for at least 26 weeks between 29 December 2013 and  4 April 2015?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+The 26 weeks don’t need to be in a row. They can be full or part weeks.
+
diff --git a/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no/yes.html b/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no/yes.html
deleted file mode 100644
index f1f34b7d29b..00000000000
--- a/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no/yes.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Calculate your leave and pay when you have a child - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Calculate your leave and pay when you have a child
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the mother’s partner earn (or will they have earned) a total of £390 or more in any 13 weeks between 29 December 2013 and  4 April 2015?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      <p>The 13 weeks don’t need to be in a row.</p>
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pay-leave-for-parents">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Will you care for the child with a partner?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Will you care for the child with a partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When is the baby due?</td>
-    <td class="previous-question-body">
-     5 April 2015</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes?previous_response=2015-04-05">
-      Change<span class="visuallyhidden"> answer to "When is the baby due?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What’s the employment status of the mother’s partner?</td>
-    <td class="previous-question-body">
-    Employee</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee?previous_response=employee">
-      Change<span class="visuallyhidden"> answer to "What’s the employment status of the mother’s partner?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother start her current or most recent job before  5 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother start her current or most recent job before  5 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother (or will she be) still working in that job on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother (or will she be) still working in that job on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother earn (or did she earn, if she’s left her job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother earn (or did she earn, if she’s left her job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother earned (or will she have earned) more than £111 per week between  1 November 2014 and 27 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Has the mother earned (or will she have earned) more than £111 per week between  1 November 2014 and 27 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother’s partner start their current or most recent job before  5 July 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother’s partner start their current or most recent job before  5 July 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Was the mother’s partner (or will they be) still working in that job on 21 December 2014?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Was the mother’s partner (or will they be) still working in that job on 21 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much does the mother’s partner earn (or did they earn, if they’ve left their job)?</td>
-    <td class="previous-question-body">
-    £10,000 per year</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes?previous_response=10000.0-year">
-      Change<span class="visuallyhidden"> answer to "How much does the mother’s partner earn (or did they earn, if they’ve left their job)?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Has the mother’s partner earned (or will they have earned) more than £111 per week between  1 November 2014 and 27 December 2014?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Has the mother’s partner earned (or will they have earned) more than £111 per week between  1 November 2014 and 27 December 2014?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the mother’s partner work (or will they have worked) for at least 26 weeks between 29 December 2013 and  4 April 2015?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pay-leave-for-parents/y/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Did the mother’s partner work (or will they have worked) for at least 26 weeks between 29 December 2013 and  4 April 2015?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no/yes.txt b/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no/yes.txt
new file mode 100644
index 00000000000..a7fcaff086b
--- /dev/null
+++ b/test/artefacts/pay-leave-for-parents/yes/2015-04-05/employee/employee/yes/yes/10000.0-year/yes/yes/yes/10000.0-year/no/yes.txt
@@ -0,0 +1,15 @@
+Did the mother’s partner earn (or will they have earned) a total of £390 or more in any 13 weeks between 29 December 2013 and  4 April 2015?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+The 13 weeks don’t need to be in a row.
+
diff --git a/test/artefacts/pip-checker/y.html b/test/artefacts/pip-checker/y.html
deleted file mode 100644
index cb8e5e58911..00000000000
--- a/test/artefacts/pip-checker/y.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check how Personal Independence Payment (PIP) affects you - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check how Personal Independence Payment (PIP) affects you
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pip-checker/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you getting Disability Living Allowance?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>If you’re checking for someone else, answer on their behalf.</p>
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pip-checker/y.txt b/test/artefacts/pip-checker/y.txt
new file mode 100644
index 00000000000..d2eeaa8e8b2
--- /dev/null
+++ b/test/artefacts/pip-checker/y.txt
@@ -0,0 +1,15 @@
+Are you getting Disability Living Allowance?
+
+If you’re checking for someone else, answer on their behalf.
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/pip-checker/yes.html b/test/artefacts/pip-checker/yes.html
deleted file mode 100644
index cc206c88829..00000000000
--- a/test/artefacts/pip-checker/yes.html
+++ /dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check how Personal Independence Payment (PIP) affects you - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check how Personal Independence Payment (PIP) affects you
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/pip-checker/y/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What's your date of birth?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you’re checking for someone else, enter their date of birth.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="1893">1893</option>
-<option value="1894">1894</option>
-<option value="1895">1895</option>
-<option value="1896">1896</option>
-<option value="1897">1897</option>
-<option value="1898">1898</option>
-<option value="1899">1899</option>
-<option value="1900">1900</option>
-<option value="1901">1901</option>
-<option value="1902">1902</option>
-<option value="1903">1903</option>
-<option value="1904">1904</option>
-<option value="1905">1905</option>
-<option value="1906">1906</option>
-<option value="1907">1907</option>
-<option value="1908">1908</option>
-<option value="1909">1909</option>
-<option value="1910">1910</option>
-<option value="1911">1911</option>
-<option value="1912">1912</option>
-<option value="1913">1913</option>
-<option value="1914">1914</option>
-<option value="1915">1915</option>
-<option value="1916">1916</option>
-<option value="1917">1917</option>
-<option value="1918">1918</option>
-<option value="1919">1919</option>
-<option value="1920">1920</option>
-<option value="1921">1921</option>
-<option value="1922">1922</option>
-<option value="1923">1923</option>
-<option value="1924">1924</option>
-<option value="1925">1925</option>
-<option value="1926">1926</option>
-<option value="1927">1927</option>
-<option value="1928">1928</option>
-<option value="1929">1929</option>
-<option value="1930">1930</option>
-<option value="1931">1931</option>
-<option value="1932">1932</option>
-<option value="1933">1933</option>
-<option value="1934">1934</option>
-<option value="1935">1935</option>
-<option value="1936">1936</option>
-<option value="1937">1937</option>
-<option value="1938">1938</option>
-<option value="1939">1939</option>
-<option value="1940">1940</option>
-<option value="1941">1941</option>
-<option value="1942">1942</option>
-<option value="1943">1943</option>
-<option value="1944">1944</option>
-<option value="1945">1945</option>
-<option value="1946">1946</option>
-<option value="1947">1947</option>
-<option value="1948">1948</option>
-<option value="1949">1949</option>
-<option value="1950">1950</option>
-<option value="1951">1951</option>
-<option value="1952">1952</option>
-<option value="1953">1953</option>
-<option value="1954">1954</option>
-<option value="1955">1955</option>
-<option value="1956">1956</option>
-<option value="1957">1957</option>
-<option value="1958">1958</option>
-<option value="1959">1959</option>
-<option value="1960">1960</option>
-<option value="1961">1961</option>
-<option value="1962">1962</option>
-<option value="1963">1963</option>
-<option value="1964">1964</option>
-<option value="1965">1965</option>
-<option value="1966">1966</option>
-<option value="1967">1967</option>
-<option value="1968">1968</option>
-<option value="1969">1969</option>
-<option value="1970">1970</option>
-<option value="1971">1971</option>
-<option value="1972">1972</option>
-<option value="1973">1973</option>
-<option value="1974">1974</option>
-<option value="1975">1975</option>
-<option value="1976">1976</option>
-<option value="1977">1977</option>
-<option value="1978">1978</option>
-<option value="1979">1979</option>
-<option value="1980">1980</option>
-<option value="1981">1981</option>
-<option value="1982">1982</option>
-<option value="1983">1983</option>
-<option value="1984">1984</option>
-<option value="1985">1985</option>
-<option value="1986">1986</option>
-<option value="1987">1987</option>
-<option value="1988">1988</option>
-<option value="1989">1989</option>
-<option value="1990">1990</option>
-<option value="1991">1991</option>
-<option value="1992">1992</option>
-<option value="1993">1993</option>
-<option value="1994">1994</option>
-<option value="1995">1995</option>
-<option value="1996">1996</option>
-<option value="1997">1997</option>
-<option value="1998">1998</option>
-<option value="1999">1999</option>
-<option value="2000">2000</option>
-<option value="2001">2001</option>
-<option value="2002">2002</option>
-<option value="2003">2003</option>
-<option value="2004">2004</option>
-<option value="2005">2005</option>
-<option value="2006">2006</option>
-<option value="2007">2007</option>
-<option value="2008">2008</option>
-<option value="2009">2009</option>
-<option value="2010">2010</option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/pip-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you getting Disability Living Allowance?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/pip-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you getting Disability Living Allowance?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/pip-checker/yes.txt b/test/artefacts/pip-checker/yes.txt
new file mode 100644
index 00000000000..885b551521f
--- /dev/null
+++ b/test/artefacts/pip-checker/yes.txt
@@ -0,0 +1,12 @@
+What's your date of birth?
+
+
+
+If you’re checking for someone else, enter their date of birth.
+
+
+
+
+
+
+
diff --git a/test/artefacts/plan-adoption-leave/2015-01-01.html b/test/artefacts/plan-adoption-leave/2015-01-01.html
deleted file mode 100644
index 81b971fb4ea..00000000000
--- a/test/artefacts/plan-adoption-leave/2015-01-01.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Plan your adoption leave - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Plan your adoption leave
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/plan-adoption-leave/y/2015-01-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When will the child start to live with you?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This is sometimes known as the 'date of placement'.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/plan-adoption-leave">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When were you matched with the child?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/plan-adoption-leave/y?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When were you matched with the child?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/plan-adoption-leave/2015-01-01.txt b/test/artefacts/plan-adoption-leave/2015-01-01.txt
new file mode 100644
index 00000000000..a486826a180
--- /dev/null
+++ b/test/artefacts/plan-adoption-leave/2015-01-01.txt
@@ -0,0 +1,12 @@
+When will the child start to live with you?
+
+
+
+This is sometimes known as the 'date of placement'.
+
+
+
+
+
+
+
diff --git a/test/artefacts/plan-adoption-leave/2015-01-01/2015-02-08.html b/test/artefacts/plan-adoption-leave/2015-01-01/2015-02-08.html
deleted file mode 100644
index b19322b6606..00000000000
--- a/test/artefacts/plan-adoption-leave/2015-01-01/2015-02-08.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Plan your adoption leave - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Plan your adoption leave
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/plan-adoption-leave/y/2015-01-01/2015-02-08" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When do you want to start your adoption leave?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Leave can start up to 14 days before the child comes to live with you.</p>
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/plan-adoption-leave">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When were you matched with the child?</td>
-    <td class="previous-question-body">
-     1 January 2015</td>
-
-  <td class="link-right">
-    <a href="/plan-adoption-leave/y?previous_response=2015-01-01">
-      Change<span class="visuallyhidden"> answer to "When were you matched with the child?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will the child start to live with you?</td>
-    <td class="previous-question-body">
-     8 February 2015</td>
-
-  <td class="link-right">
-    <a href="/plan-adoption-leave/y/2015-01-01?previous_response=2015-02-08">
-      Change<span class="visuallyhidden"> answer to "When will the child start to live with you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/plan-adoption-leave/2015-01-01/2015-02-08.txt b/test/artefacts/plan-adoption-leave/2015-01-01/2015-02-08.txt
new file mode 100644
index 00000000000..c4a196b8238
--- /dev/null
+++ b/test/artefacts/plan-adoption-leave/2015-01-01/2015-02-08.txt
@@ -0,0 +1,12 @@
+When do you want to start your adoption leave?
+
+
+
+Leave can start up to 14 days before the child comes to live with you.
+
+
+
+
+
+
+
diff --git a/test/artefacts/plan-adoption-leave/y.html b/test/artefacts/plan-adoption-leave/y.html
deleted file mode 100644
index 0c68451c968..00000000000
--- a/test/artefacts/plan-adoption-leave/y.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Plan your adoption leave - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Plan your adoption leave
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/plan-adoption-leave/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When were you matched with the child?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/plan-adoption-leave/y.txt b/test/artefacts/plan-adoption-leave/y.txt
new file mode 100644
index 00000000000..161eceb9e62
--- /dev/null
+++ b/test/artefacts/plan-adoption-leave/y.txt
@@ -0,0 +1,12 @@
+When were you matched with the child?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-birth/afghanistan.html b/test/artefacts/register-a-birth/afghanistan.html
deleted file mode 100644
index 3a57b6127b7..00000000000
--- a/test/artefacts/register-a-birth/afghanistan.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a birth abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a birth abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-birth/y/afghanistan" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Who has British nationality?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>If the British parent was born abroad, they may be a British citizen ‘by descent’. This means they may not be allowed to pass on their British nationality to a child also born abroad. <a href="/check-british-citizen">Check if the parent is a British citizen by descent</a>.</p>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="mother" />
-        Mother only
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="father" />
-        Father only
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="mother_and_father" />
-        Mother and father
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="neither" />
-        Neither
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-birth">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which country was the child born in?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country was the child born in?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-birth/afghanistan.txt b/test/artefacts/register-a-birth/afghanistan.txt
new file mode 100644
index 00000000000..e5597a296eb
--- /dev/null
+++ b/test/artefacts/register-a-birth/afghanistan.txt
@@ -0,0 +1,17 @@
+Who has British nationality?
+
+If the British parent was born abroad, they may be a British citizen ‘by descent’. This means they may not be allowed to pass on their British nationality to a child also born abroad. [Check if the parent is a British citizen by descent](/check-british-citizen).
+
+
+
+
+  * mother: Mother only
+  * father: Father only
+  * mother_and_father: Mother and father
+  * neither: Neither
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-birth/afghanistan/father/no.html b/test/artefacts/register-a-birth/afghanistan/father/no.html
deleted file mode 100644
index a31517a9315..00000000000
--- a/test/artefacts/register-a-birth/afghanistan/father/no.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a birth abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a birth abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-birth/y/afghanistan/father/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is your child’s date of birth?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2015">2015</option>
-<option value="2014">2014</option>
-<option value="2013">2013</option>
-<option value="2012">2012</option>
-<option value="2011">2011</option>
-<option value="2010">2010</option>
-<option value="2009">2009</option>
-<option value="2008">2008</option>
-<option value="2007">2007</option>
-<option value="2006">2006</option>
-<option value="2005">2005</option>
-<option value="2004">2004</option>
-<option value="2003">2003</option>
-<option value="2002">2002</option>
-<option value="2001">2001</option>
-<option value="2000">2000</option>
-<option value="1999">1999</option>
-<option value="1998">1998</option>
-<option value="1997">1997</option>
-<option value="1996">1996</option>
-<option value="1995">1995</option>
-<option value="1994">1994</option>
-<option value="1993">1993</option>
-<option value="1992">1992</option>
-<option value="1991">1991</option>
-<option value="1990">1990</option>
-<option value="1989">1989</option>
-<option value="1988">1988</option>
-<option value="1987">1987</option>
-<option value="1986">1986</option>
-<option value="1985">1985</option>
-<option value="1984">1984</option>
-<option value="1983">1983</option>
-<option value="1982">1982</option>
-<option value="1981">1981</option>
-<option value="1980">1980</option>
-<option value="1979">1979</option>
-<option value="1978">1978</option>
-<option value="1977">1977</option>
-<option value="1976">1976</option>
-<option value="1975">1975</option>
-<option value="1974">1974</option>
-<option value="1973">1973</option>
-<option value="1972">1972</option>
-<option value="1971">1971</option>
-<option value="1970">1970</option>
-<option value="1969">1969</option>
-<option value="1968">1968</option>
-<option value="1967">1967</option>
-<option value="1966">1966</option>
-<option value="1965">1965</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-birth">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which country was the child born in?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country was the child born in?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Who has British nationality?</td>
-    <td class="previous-question-body">
-    Father only</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y/afghanistan?previous_response=father">
-      Change<span class="visuallyhidden"> answer to "Who has British nationality?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you married to the other parent when your child was born?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y/afghanistan/father?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Were you married to the other parent when your child was born?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-birth/afghanistan/father/no.txt b/test/artefacts/register-a-birth/afghanistan/father/no.txt
new file mode 100644
index 00000000000..2e1979898d9
--- /dev/null
+++ b/test/artefacts/register-a-birth/afghanistan/father/no.txt
@@ -0,0 +1,12 @@
+What is your child’s date of birth?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-birth/afghanistan/mother.html b/test/artefacts/register-a-birth/afghanistan/mother.html
deleted file mode 100644
index 0b13e946518..00000000000
--- a/test/artefacts/register-a-birth/afghanistan/mother.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a birth abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a birth abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-birth/y/afghanistan/mother" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Were you married to the other parent when your child was born?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-birth">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which country was the child born in?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country was the child born in?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Who has British nationality?</td>
-    <td class="previous-question-body">
-    Mother only</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y/afghanistan?previous_response=mother">
-      Change<span class="visuallyhidden"> answer to "Who has British nationality?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-birth/afghanistan/mother.txt b/test/artefacts/register-a-birth/afghanistan/mother.txt
new file mode 100644
index 00000000000..5c63b859cd3
--- /dev/null
+++ b/test/artefacts/register-a-birth/afghanistan/mother.txt
@@ -0,0 +1,14 @@
+Were you married to the other parent when your child was born?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-birth/afghanistan/mother/yes.html b/test/artefacts/register-a-birth/afghanistan/mother/yes.html
deleted file mode 100644
index 21ce03d6c84..00000000000
--- a/test/artefacts/register-a-birth/afghanistan/mother/yes.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a birth abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a birth abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-birth/y/afghanistan/mother/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Where are you now?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="same_country" />
-        In the country where the child was born
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="another_country" />
-        In another country
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="in_the_uk" />
-        In the UK
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-birth">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which country was the child born in?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country was the child born in?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Who has British nationality?</td>
-    <td class="previous-question-body">
-    Mother only</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y/afghanistan?previous_response=mother">
-      Change<span class="visuallyhidden"> answer to "Who has British nationality?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you married to the other parent when your child was born?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y/afghanistan/mother?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you married to the other parent when your child was born?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-birth/afghanistan/mother/yes.txt b/test/artefacts/register-a-birth/afghanistan/mother/yes.txt
new file mode 100644
index 00000000000..e727fcfae27
--- /dev/null
+++ b/test/artefacts/register-a-birth/afghanistan/mother/yes.txt
@@ -0,0 +1,15 @@
+Where are you now?
+
+
+
+
+
+  * same_country: In the country where the child was born
+  * another_country: In another country
+  * in_the_uk: In the UK
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-birth/afghanistan/mother/yes/another_country.html b/test/artefacts/register-a-birth/afghanistan/mother/yes/another_country.html
deleted file mode 100644
index d131a59d59c..00000000000
--- a/test/artefacts/register-a-birth/afghanistan/mother/yes/another_country.html
+++ /dev/null
@@ -1,360 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a birth abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a birth abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-birth/y/afghanistan/mother/yes/another_country" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which country?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-guiana">French Guiana</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guadeloupe">Guadeloupe</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="martinique">Martinique</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mayotte">Mayotte</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="reunion">Reunion</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="the-occupied-palestinian-territories">The Occupied Palestinian Territories</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-birth">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Which country was the child born in?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country was the child born in?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Who has British nationality?</td>
-    <td class="previous-question-body">
-    Mother only</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y/afghanistan?previous_response=mother">
-      Change<span class="visuallyhidden"> answer to "Who has British nationality?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Were you married to the other parent when your child was born?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y/afghanistan/mother?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Were you married to the other parent when your child was born?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Where are you now?</td>
-    <td class="previous-question-body">
-    In another country</td>
-
-  <td class="link-right">
-    <a href="/register-a-birth/y/afghanistan/mother/yes?previous_response=another_country">
-      Change<span class="visuallyhidden"> answer to "Where are you now?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-birth/afghanistan/mother/yes/another_country.txt b/test/artefacts/register-a-birth/afghanistan/mother/yes/another_country.txt
new file mode 100644
index 00000000000..f2b69ba900c
--- /dev/null
+++ b/test/artefacts/register-a-birth/afghanistan/mother/yes/another_country.txt
@@ -0,0 +1,238 @@
+Which country?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-guiana: French Guiana
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guadeloupe: Guadeloupe
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * martinique: Martinique
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mayotte: Mayotte
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * reunion: Reunion
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * the-occupied-palestinian-territories: The Occupied Palestinian Territories
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-birth/y.html b/test/artefacts/register-a-birth/y.html
deleted file mode 100644
index fac96e86298..00000000000
--- a/test/artefacts/register-a-birth/y.html
+++ /dev/null
@@ -1,302 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a birth abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a birth abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-birth/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which country was the child born in?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-guiana">French Guiana</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guadeloupe">Guadeloupe</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="martinique">Martinique</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mayotte">Mayotte</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="reunion">Reunion</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="the-occupied-palestinian-territories">The Occupied Palestinian Territories</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-birth/y.txt b/test/artefacts/register-a-birth/y.txt
new file mode 100644
index 00000000000..307813be0eb
--- /dev/null
+++ b/test/artefacts/register-a-birth/y.txt
@@ -0,0 +1,238 @@
+Which country was the child born in?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-guiana: French Guiana
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guadeloupe: Guadeloupe
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * martinique: Martinique
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mayotte: Mayotte
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * reunion: Reunion
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * the-occupied-palestinian-territories: The Occupied Palestinian Territories
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-death/england_wales.html b/test/artefacts/register-a-death/england_wales.html
deleted file mode 100644
index bd5c8ad26c4..00000000000
--- a/test/artefacts/register-a-death/england_wales.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a death - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a death
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-death/y/england_wales" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did the person die at home, in hospital or elsewhere?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="at_home_hospital" />
-        At home or in hospital
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="elsewhere" />
-        Elsewhere
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-death">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the death happen?</td>
-    <td class="previous-question-body">
-    England or Wales</td>
-
-  <td class="link-right">
-    <a href="/register-a-death/y?previous_response=england_wales">
-      Change<span class="visuallyhidden"> answer to "Where did the death happen?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-death/england_wales.txt b/test/artefacts/register-a-death/england_wales.txt
new file mode 100644
index 00000000000..a6e8741abfa
--- /dev/null
+++ b/test/artefacts/register-a-death/england_wales.txt
@@ -0,0 +1,14 @@
+Did the person die at home, in hospital or elsewhere?
+
+
+
+
+
+  * at_home_hospital: At home or in hospital
+  * elsewhere: Elsewhere
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-death/england_wales/at_home_hospital.html b/test/artefacts/register-a-death/england_wales/at_home_hospital.html
deleted file mode 100644
index 1358220fc09..00000000000
--- a/test/artefacts/register-a-death/england_wales/at_home_hospital.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a death - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a death
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-death/y/england_wales/at_home_hospital" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Was the death expected?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-death">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the death happen?</td>
-    <td class="previous-question-body">
-    England or Wales</td>
-
-  <td class="link-right">
-    <a href="/register-a-death/y?previous_response=england_wales">
-      Change<span class="visuallyhidden"> answer to "Where did the death happen?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did the person die at home, in hospital or elsewhere?</td>
-    <td class="previous-question-body">
-    At home or in hospital</td>
-
-  <td class="link-right">
-    <a href="/register-a-death/y/england_wales?previous_response=at_home_hospital">
-      Change<span class="visuallyhidden"> answer to "Did the person die at home, in hospital or elsewhere?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-death/england_wales/at_home_hospital.txt b/test/artefacts/register-a-death/england_wales/at_home_hospital.txt
new file mode 100644
index 00000000000..927303abde6
--- /dev/null
+++ b/test/artefacts/register-a-death/england_wales/at_home_hospital.txt
@@ -0,0 +1,14 @@
+Was the death expected?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-death/overseas.html b/test/artefacts/register-a-death/overseas.html
deleted file mode 100644
index 621f78c83f8..00000000000
--- a/test/artefacts/register-a-death/overseas.html
+++ /dev/null
@@ -1,327 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a death - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a death
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-death/y/overseas" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which country did the death happen in?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-guiana">French Guiana</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guadeloupe">Guadeloupe</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="martinique">Martinique</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mayotte">Mayotte</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="reunion">Reunion</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="the-occupied-palestinian-territories">The Occupied Palestinian Territories</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-death">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the death happen?</td>
-    <td class="previous-question-body">
-    Abroad</td>
-
-  <td class="link-right">
-    <a href="/register-a-death/y?previous_response=overseas">
-      Change<span class="visuallyhidden"> answer to "Where did the death happen?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-death/overseas.txt b/test/artefacts/register-a-death/overseas.txt
new file mode 100644
index 00000000000..611c3d07acc
--- /dev/null
+++ b/test/artefacts/register-a-death/overseas.txt
@@ -0,0 +1,238 @@
+Which country did the death happen in?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-guiana: French Guiana
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guadeloupe: Guadeloupe
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * martinique: Martinique
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mayotte: Mayotte
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * reunion: Reunion
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * the-occupied-palestinian-territories: The Occupied Palestinian Territories
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-death/overseas/north-korea.html b/test/artefacts/register-a-death/overseas/north-korea.html
deleted file mode 100644
index 6f5c24b95c7..00000000000
--- a/test/artefacts/register-a-death/overseas/north-korea.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a death - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a death
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-death/y/overseas/north-korea" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Where are you now?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="same_country" />
-        In the country where the death happened
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="another_country" />
-        In another country
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="in_the_uk" />
-        In the UK
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-death">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the death happen?</td>
-    <td class="previous-question-body">
-    Abroad</td>
-
-  <td class="link-right">
-    <a href="/register-a-death/y?previous_response=overseas">
-      Change<span class="visuallyhidden"> answer to "Where did the death happen?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which country did the death happen in?</td>
-    <td class="previous-question-body">
-    North Korea</td>
-
-  <td class="link-right">
-    <a href="/register-a-death/y/overseas?previous_response=north-korea">
-      Change<span class="visuallyhidden"> answer to "Which country did the death happen in?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-death/overseas/north-korea.txt b/test/artefacts/register-a-death/overseas/north-korea.txt
new file mode 100644
index 00000000000..8fe562052cd
--- /dev/null
+++ b/test/artefacts/register-a-death/overseas/north-korea.txt
@@ -0,0 +1,15 @@
+Where are you now?
+
+
+
+
+
+  * same_country: In the country where the death happened
+  * another_country: In another country
+  * in_the_uk: In the UK
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-death/overseas/north-korea/another_country.html b/test/artefacts/register-a-death/overseas/north-korea/another_country.html
deleted file mode 100644
index fc44d53796f..00000000000
--- a/test/artefacts/register-a-death/overseas/north-korea/another_country.html
+++ /dev/null
@@ -1,349 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a death - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a death
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-death/y/overseas/north-korea/another_country" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which country are you in now?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-guiana">French Guiana</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guadeloupe">Guadeloupe</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="martinique">Martinique</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mayotte">Mayotte</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="reunion">Reunion</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="the-occupied-palestinian-territories">The Occupied Palestinian Territories</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/register-a-death">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where did the death happen?</td>
-    <td class="previous-question-body">
-    Abroad</td>
-
-  <td class="link-right">
-    <a href="/register-a-death/y?previous_response=overseas">
-      Change<span class="visuallyhidden"> answer to "Where did the death happen?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which country did the death happen in?</td>
-    <td class="previous-question-body">
-    North Korea</td>
-
-  <td class="link-right">
-    <a href="/register-a-death/y/overseas?previous_response=north-korea">
-      Change<span class="visuallyhidden"> answer to "Which country did the death happen in?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Where are you now?</td>
-    <td class="previous-question-body">
-    In another country</td>
-
-  <td class="link-right">
-    <a href="/register-a-death/y/overseas/north-korea?previous_response=another_country">
-      Change<span class="visuallyhidden"> answer to "Where are you now?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-death/overseas/north-korea/another_country.txt b/test/artefacts/register-a-death/overseas/north-korea/another_country.txt
new file mode 100644
index 00000000000..937fe011bab
--- /dev/null
+++ b/test/artefacts/register-a-death/overseas/north-korea/another_country.txt
@@ -0,0 +1,238 @@
+Which country are you in now?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-guiana: French Guiana
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guadeloupe: Guadeloupe
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * martinique: Martinique
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mayotte: Mayotte
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * reunion: Reunion
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * the-occupied-palestinian-territories: The Occupied Palestinian Territories
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/register-a-death/y.html b/test/artefacts/register-a-death/y.html
deleted file mode 100644
index 28c8d5d57c4..00000000000
--- a/test/artefacts/register-a-death/y.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Register a death - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Register a death
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/register-a-death/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Where did the death happen?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="england_wales" />
-        England or Wales
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="scotland" />
-        Scotland
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="northern_ireland" />
-        Northern Ireland
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="overseas" />
-        Abroad
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/register-a-death/y.txt b/test/artefacts/register-a-death/y.txt
new file mode 100644
index 00000000000..df4f64c1799
--- /dev/null
+++ b/test/artefacts/register-a-death/y.txt
@@ -0,0 +1,16 @@
+Where did the death happen?
+
+
+
+
+
+  * england_wales: England or Wales
+  * scotland: Scotland
+  * northern_ireland: Northern Ireland
+  * overseas: Abroad
+
+
+
+
+
+
diff --git a/test/artefacts/report-a-lost-or-stolen-passport/abroad.html b/test/artefacts/report-a-lost-or-stolen-passport/abroad.html
deleted file mode 100644
index 769477d81b7..00000000000
--- a/test/artefacts/report-a-lost-or-stolen-passport/abroad.html
+++ /dev/null
@@ -1,327 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Cancel a lost or stolen passport - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Cancel a lost or stolen passport
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/report-a-lost-or-stolen-passport/y/abroad" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    In which country?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-guiana">French Guiana</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guadeloupe">Guadeloupe</option>
-<option value="guatemala">Guatemala</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="martinique">Martinique</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mayotte">Mayotte</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="reunion">Reunion</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-maarten">St Maarten</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="the-occupied-palestinian-territories">The Occupied Palestinian Territories</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/report-a-lost-or-stolen-passport">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Where was the passport lost or stolen?</td>
-    <td class="previous-question-body">
-    Abroad</td>
-
-  <td class="link-right">
-    <a href="/report-a-lost-or-stolen-passport/y?previous_response=abroad">
-      Change<span class="visuallyhidden"> answer to "Where was the passport lost or stolen?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/report-a-lost-or-stolen-passport/abroad.txt b/test/artefacts/report-a-lost-or-stolen-passport/abroad.txt
new file mode 100644
index 00000000000..cf1dd142423
--- /dev/null
+++ b/test/artefacts/report-a-lost-or-stolen-passport/abroad.txt
@@ -0,0 +1,238 @@
+In which country?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-guiana: French Guiana
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guadeloupe: Guadeloupe
+  * guatemala: Guatemala
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * martinique: Martinique
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mayotte: Mayotte
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * reunion: Reunion
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-maarten: St Maarten
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * the-occupied-palestinian-territories: The Occupied Palestinian Territories
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/report-a-lost-or-stolen-passport/y.html b/test/artefacts/report-a-lost-or-stolen-passport/y.html
deleted file mode 100644
index 62f80996d7f..00000000000
--- a/test/artefacts/report-a-lost-or-stolen-passport/y.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Cancel a lost or stolen passport - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Cancel a lost or stolen passport
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/report-a-lost-or-stolen-passport/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Where was the passport lost or stolen?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="in_the_uk" />
-        In the UK
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="abroad" />
-        Abroad
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/report-a-lost-or-stolen-passport/y.txt b/test/artefacts/report-a-lost-or-stolen-passport/y.txt
new file mode 100644
index 00000000000..db0ea77206c
--- /dev/null
+++ b/test/artefacts/report-a-lost-or-stolen-passport/y.txt
@@ -0,0 +1,14 @@
+Where was the passport lost or stolen?
+
+
+
+
+
+  * in_the_uk: In the UK
+  * abroad: Abroad
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/y.html b/test/artefacts/simplified-expenses-checker/y.html
deleted file mode 100644
index 7d47367de78..00000000000
--- a/test/artefacts/simplified-expenses-checker/y.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Have you claimed expenses for your current business before?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you’re a new business you won’t have claimed expenses before.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/y.txt b/test/artefacts/simplified-expenses-checker/y.txt
new file mode 100644
index 00000000000..54c7c9ac0ff
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/y.txt
@@ -0,0 +1,14 @@
+Have you claimed expenses for your current business before?
+
+
+
+If you’re a new business you won’t have claimed expenses before.
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes.html b/test/artefacts/simplified-expenses-checker/yes.html
deleted file mode 100644
index 15fa2c42df9..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you have any of these expenses as part of your business?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">If you don't have any of these expenses go to 'Next step'.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="car_or_van" />
-        Car or van (business use)
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="motorcycle" />
-        Motorcycle (business use)
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="using_home_for_business" />
-        Working from home (the main purpose of the building is your home)
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="live_on_business_premises" />
-        Living on your business premises (the main purpose of the building where you live is your business, eg a B&amp;B, and you're likely to pay business rates instead of council tax)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes.txt b/test/artefacts/simplified-expenses-checker/yes.txt
new file mode 100644
index 00000000000..d7b6d85af36
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes.txt
@@ -0,0 +1,16 @@
+Do you have any of these expenses as part of your business?
+
+
+
+If you don't have any of these expenses go to 'Next step'.
+
+  * car_or_van: Car or van (business use)
+  * motorcycle: Motorcycle (business use)
+  * using_home_for_business: Working from home (the main purpose of the building is your home)
+  * live_on_business_premises: Living on your business premises (the main purpose of the building where you live is your business, eg a B&amp;B, and you're likely to pay business rates instead of council tax)
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000.html b/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000.html
deleted file mode 100644
index 61d2521b3e0..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    On average, how many hours a month do you work or expect to work from home?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You have to work at least 25 hours per month from home to use simplified home expenses.</p>
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Car or van (business use)</li>
-      <li>Working from home (the main purpose of the building is your home)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=car_or_van%2Cusing_home_for_business">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the vehicle you're buying green, ie a low emission vehicle?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the vehicle you're buying green, ie a low emission vehicle?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much is the car, van or motorcycle you’re buying?</td>
-    <td class="previous-question-body">
-    £35,000</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes/yes?previous_response=35000.0">
-      Change<span class="visuallyhidden"> answer to "How much is the car, van or motorcycle you’re buying?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much of your driving time do you expect to be for business use?</td>
-    <td class="previous-question-body">
-    35.0</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes/yes/35000.0?previous_response=35.0">
-      Change<span class="visuallyhidden"> answer to "How much of your driving time do you expect to be for business use?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many miles do you expect to drive your car or van for business during the tax year?</td>
-    <td class="previous-question-body">
-    10,000</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0?previous_response=10000">
-      Change<span class="visuallyhidden"> answer to "How many miles do you expect to drive your car or van for business during the tax year?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000.txt b/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000.txt
new file mode 100644
index 00000000000..bd8f58d6c95
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000.txt
@@ -0,0 +1,12 @@
+On average, how many hours a month do you work or expect to work from home?
+
+
+
+You have to work at least 25 hours per month from home to use simplified home expenses.
+
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000/26.html b/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000/26.html
deleted file mode 100644
index 7e189068800..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000/26.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000/26" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much of your home costs do you expect to claim as business expenses this tax year?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The business proportion of utility bills, eg gas and electricity. Don't include phone and internet bills.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Car or van (business use)</li>
-      <li>Working from home (the main purpose of the building is your home)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=car_or_van%2Cusing_home_for_business">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the vehicle you're buying green, ie a low emission vehicle?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the vehicle you're buying green, ie a low emission vehicle?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much is the car, van or motorcycle you’re buying?</td>
-    <td class="previous-question-body">
-    £35,000</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes/yes?previous_response=35000.0">
-      Change<span class="visuallyhidden"> answer to "How much is the car, van or motorcycle you’re buying?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much of your driving time do you expect to be for business use?</td>
-    <td class="previous-question-body">
-    35.0</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes/yes/35000.0?previous_response=35.0">
-      Change<span class="visuallyhidden"> answer to "How much of your driving time do you expect to be for business use?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many miles do you expect to drive your car or van for business during the tax year?</td>
-    <td class="previous-question-body">
-    10,000</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0?previous_response=10000">
-      Change<span class="visuallyhidden"> answer to "How many miles do you expect to drive your car or van for business during the tax year?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">On average, how many hours a month do you work or expect to work from home?</td>
-    <td class="previous-question-body">
-    26</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000?previous_response=26">
-      Change<span class="visuallyhidden"> answer to "On average, how many hours a month do you work or expect to work from home?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000/26.txt b/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000/26.txt
new file mode 100644
index 00000000000..89d67168ce6
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/car_or_van,using_home_for_business/yes/yes/35000.0/35.0/10000/26.txt
@@ -0,0 +1,12 @@
+How much of your home costs do you expect to claim as business expenses this tax year?
+
+
+
+The business proportion of utility bills, eg gas and electricity. Don't include phone and internet bills.
+
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van.html b/test/artefacts/simplified-expenses-checker/yes/car_or_van.html
deleted file mode 100644
index 72cfd066c24..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/car_or_van.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/car_or_van" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Car or van (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=car_or_van">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van.txt b/test/artefacts/simplified-expenses-checker/yes/car_or_van.txt
new file mode 100644
index 00000000000..fb5c370fff1
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/car_or_van.txt
@@ -0,0 +1,14 @@
+Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/no.html b/test/artefacts/simplified-expenses-checker/yes/car_or_van/no.html
deleted file mode 100644
index 680231151ee..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/car_or_van/no.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/car_or_van/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Have you claimed Capital Allowances for your existing car, van or motorcycle before?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Car or van (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=car_or_van">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/no.txt b/test/artefacts/simplified-expenses-checker/yes/car_or_van/no.txt
new file mode 100644
index 00000000000..34ff355ad61
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/car_or_van/no.txt
@@ -0,0 +1,14 @@
+Have you claimed Capital Allowances for your existing car, van or motorcycle before?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/no/no.html b/test/artefacts/simplified-expenses-checker/yes/car_or_van/no/no.html
deleted file mode 100644
index 312798ce0d0..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/car_or_van/no/no.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/car_or_van/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you expect to claim as business expenses for running and maintaining your car, van or motorcycle over the tax year?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Only include the business proportion of costs for your main vehicle, eg fuel, servicing, repairs and insurance.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Car or van (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=car_or_van">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed Capital Allowances for your existing car, van or motorcycle before?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Have you claimed Capital Allowances for your existing car, van or motorcycle before?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/no/no.txt b/test/artefacts/simplified-expenses-checker/yes/car_or_van/no/no.txt
new file mode 100644
index 00000000000..21fcff0522c
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/car_or_van/no/no.txt
@@ -0,0 +1,12 @@
+How much do you expect to claim as business expenses for running and maintaining your car, van or motorcycle over the tax year?
+
+
+
+Only include the business proportion of costs for your main vehicle, eg fuel, servicing, repairs and insurance.
+
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes.html b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes.html
deleted file mode 100644
index 90770859efc..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/car_or_van/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is the vehicle you're buying green, ie a low emission vehicle?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Car or van (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=car_or_van">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes.txt b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes.txt
new file mode 100644
index 00000000000..7d32a68bfe6
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes.txt
@@ -0,0 +1,14 @@
+Is the vehicle you're buying green, ie a low emission vehicle?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes.html b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes.html
deleted file mode 100644
index ce6211d1ebf..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/car_or_van/yes/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much is the car, van or motorcycle you’re buying?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Include VAT unless your business is VAT registered.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Car or van (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=car_or_van">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the vehicle you're buying green, ie a low emission vehicle?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the vehicle you're buying green, ie a low emission vehicle?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes.txt b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes.txt
new file mode 100644
index 00000000000..7af8dbc8c53
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes.txt
@@ -0,0 +1,12 @@
+How much is the car, van or motorcycle you’re buying?
+
+
+
+Include VAT unless your business is VAT registered.
+
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.0/35.html b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.0/35.html
deleted file mode 100644
index c7d7cf70a43..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.0/35.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/car_or_van/yes/yes/35000.0/35.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many miles do you expect to drive your car or van for business during the tax year?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Car or van (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=car_or_van">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the vehicle you're buying green, ie a low emission vehicle?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the vehicle you're buying green, ie a low emission vehicle?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much is the car, van or motorcycle you’re buying?</td>
-    <td class="previous-question-body">
-    £35,000</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van/yes/yes?previous_response=35000.0">
-      Change<span class="visuallyhidden"> answer to "How much is the car, van or motorcycle you’re buying?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much of your driving time do you expect to be for business use?</td>
-    <td class="previous-question-body">
-    35.0</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van/yes/yes/35000.0?previous_response=35.0">
-      Change<span class="visuallyhidden"> answer to "How much of your driving time do you expect to be for business use?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.0/35.txt b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.0/35.txt
new file mode 100644
index 00000000000..32ba0a17e09
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.0/35.txt
@@ -0,0 +1,12 @@
+How many miles do you expect to drive your car or van for business during the tax year?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.html b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.html
deleted file mode 100644
index 2366a2061de..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/car_or_van/yes/yes/35000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much of your driving time do you expect to be for business use?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <label for="response"><input type="text" name="response" id="response" />% of the time</label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Car or van (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=car_or_van">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the vehicle you're buying green, ie a low emission vehicle?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the vehicle you're buying green, ie a low emission vehicle?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much is the car, van or motorcycle you’re buying?</td>
-    <td class="previous-question-body">
-    £35,000</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/car_or_van/yes/yes?previous_response=35000.0">
-      Change<span class="visuallyhidden"> answer to "How much is the car, van or motorcycle you’re buying?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.txt b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.txt
new file mode 100644
index 00000000000..d351a97f7d2
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/car_or_van/yes/yes/35000.txt
@@ -0,0 +1,12 @@
+How much of your driving time do you expect to be for business use?
+
+
+
+
+
+
+
+
+% of the time
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500.html b/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500.html
deleted file mode 100644
index 0c312ae06d2..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much do you expect to deduct from your business expenses this tax year for your private use of the premises?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">For example, a proportion of your maintenance, utility and insurance bills.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Living on your business premises (the main purpose of the building where you live is your business, eg a B&amp;B, and you're likely to pay business rates instead of council tax)</li>
-      <li>Motorcycle (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=live_on_business_premises%2Cmotorcycle">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the vehicle you're buying green, ie a low emission vehicle?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the vehicle you're buying green, ie a low emission vehicle?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much is the car, van or motorcycle you’re buying?</td>
-    <td class="previous-question-body">
-    £35,000</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes?previous_response=35000.0">
-      Change<span class="visuallyhidden"> answer to "How much is the car, van or motorcycle you’re buying?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much of your driving time do you expect to be for business use?</td>
-    <td class="previous-question-body">
-    35.0</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes/35000.0?previous_response=35.0">
-      Change<span class="visuallyhidden"> answer to "How much of your driving time do you expect to be for business use?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many miles do you expect to drive your motorcycle for business during the tax year?</td>
-    <td class="previous-question-body">
-    7,500</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0?previous_response=7500">
-      Change<span class="visuallyhidden"> answer to "How many miles do you expect to drive your motorcycle for business during the tax year?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500.txt b/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500.txt
new file mode 100644
index 00000000000..9fe380aeafc
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500.txt
@@ -0,0 +1,12 @@
+How much do you expect to deduct from your business expenses this tax year for your private use of the premises?
+
+
+
+For example, a proportion of your maintenance, utility and insurance bills.
+
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500/789.html b/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500/789.html
deleted file mode 100644
index 6d573a3787e..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500/789.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500/789.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many people normally live on the business premises?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Include children and non-paying guests. Don't include paying guests or anyone using the premises as part of your business. Give an average if there are more people at certain times of the year.</p>
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Living on your business premises (the main purpose of the building where you live is your business, eg a B&amp;B, and you're likely to pay business rates instead of council tax)</li>
-      <li>Motorcycle (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=live_on_business_premises%2Cmotorcycle">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the vehicle you're buying green, ie a low emission vehicle?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the vehicle you're buying green, ie a low emission vehicle?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much is the car, van or motorcycle you’re buying?</td>
-    <td class="previous-question-body">
-    £35,000</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes?previous_response=35000.0">
-      Change<span class="visuallyhidden"> answer to "How much is the car, van or motorcycle you’re buying?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much of your driving time do you expect to be for business use?</td>
-    <td class="previous-question-body">
-    35.0</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes/35000.0?previous_response=35.0">
-      Change<span class="visuallyhidden"> answer to "How much of your driving time do you expect to be for business use?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How many miles do you expect to drive your motorcycle for business during the tax year?</td>
-    <td class="previous-question-body">
-    7,500</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0?previous_response=7500">
-      Change<span class="visuallyhidden"> answer to "How many miles do you expect to drive your motorcycle for business during the tax year?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much do you expect to deduct from your business expenses this tax year for your private use of the premises?</td>
-    <td class="previous-question-body">
-    £789</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500?previous_response=789.0">
-      Change<span class="visuallyhidden"> answer to "How much do you expect to deduct from your business expenses this tax year for your private use of the premises?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500/789.txt b/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500/789.txt
new file mode 100644
index 00000000000..4fd40230bb9
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0/7500/789.txt
@@ -0,0 +1,12 @@
+How many people normally live on the business premises?
+
+
+
+Include children and non-paying guests. Don't include paying guests or anyone using the premises as part of your business. Give an average if there are more people at certain times of the year.
+
+
+
+
+
+
+
diff --git a/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.html b/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.html
deleted file mode 100644
index a910bdf25a2..00000000000
--- a/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check if simplified expenses works for your business - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check if simplified expenses works for your business
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How many miles do you expect to drive your motorcycle for business during the tax year?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <input type="text" name="response" id="response" />
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/simplified-expenses-checker">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Have you claimed expenses for your current business before?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Have you claimed expenses for your current business before?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any of these expenses as part of your business?</td>
-    <td class="previous-question-body"><ul>
-      <li>Living on your business premises (the main purpose of the building where you live is your business, eg a B&amp;B, and you're likely to pay business rates instead of council tax)</li>
-      <li>Motorcycle (business use)</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes?previous_response=live_on_business_premises%2Cmotorcycle">
-      Change<span class="visuallyhidden"> answer to "Do you have any of these expenses as part of your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you buying a new car, van or motorcycle this tax year that you expect to use for your business?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is the vehicle you're buying green, ie a low emission vehicle?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is the vehicle you're buying green, ie a low emission vehicle?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much is the car, van or motorcycle you’re buying?</td>
-    <td class="previous-question-body">
-    £35,000</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes?previous_response=35000.0">
-      Change<span class="visuallyhidden"> answer to "How much is the car, van or motorcycle you’re buying?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much of your driving time do you expect to be for business use?</td>
-    <td class="previous-question-body">
-    35.0</td>
-
-  <td class="link-right">
-    <a href="/simplified-expenses-checker/y/yes/live_on_business_premises,motorcycle/yes/yes/35000.0?previous_response=35.0">
-      Change<span class="visuallyhidden"> answer to "How much of your driving time do you expect to be for business use?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.txt b/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.txt
new file mode 100644
index 00000000000..db57dad7f1a
--- /dev/null
+++ b/test/artefacts/simplified-expenses-checker/yes/live_on_business_premises,motorcycle/yes/yes/35000.0/35.txt
@@ -0,0 +1,12 @@
+How many miles do you expect to drive your motorcycle for business during the tax year?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-age/age.html b/test/artefacts/state-pension-age/age.html
deleted file mode 100644
index 1f006e0f032..00000000000
--- a/test/artefacts/state-pension-age/age.html
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check your State Pension age - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check your State Pension age
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-age/y/age" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is your date of birth?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="1893">1893</option>
-<option value="1894">1894</option>
-<option value="1895">1895</option>
-<option value="1896">1896</option>
-<option value="1897">1897</option>
-<option value="1898">1898</option>
-<option value="1899">1899</option>
-<option value="1900">1900</option>
-<option value="1901">1901</option>
-<option value="1902">1902</option>
-<option value="1903">1903</option>
-<option value="1904">1904</option>
-<option value="1905">1905</option>
-<option value="1906">1906</option>
-<option value="1907">1907</option>
-<option value="1908">1908</option>
-<option value="1909">1909</option>
-<option value="1910">1910</option>
-<option value="1911">1911</option>
-<option value="1912">1912</option>
-<option value="1913">1913</option>
-<option value="1914">1914</option>
-<option value="1915">1915</option>
-<option value="1916">1916</option>
-<option value="1917">1917</option>
-<option value="1918">1918</option>
-<option value="1919">1919</option>
-<option value="1920">1920</option>
-<option value="1921">1921</option>
-<option value="1922">1922</option>
-<option value="1923">1923</option>
-<option value="1924">1924</option>
-<option value="1925">1925</option>
-<option value="1926">1926</option>
-<option value="1927">1927</option>
-<option value="1928">1928</option>
-<option value="1929">1929</option>
-<option value="1930">1930</option>
-<option value="1931">1931</option>
-<option value="1932">1932</option>
-<option value="1933">1933</option>
-<option value="1934">1934</option>
-<option value="1935">1935</option>
-<option value="1936">1936</option>
-<option value="1937">1937</option>
-<option value="1938">1938</option>
-<option value="1939">1939</option>
-<option value="1940">1940</option>
-<option value="1941">1941</option>
-<option value="1942">1942</option>
-<option value="1943">1943</option>
-<option value="1944">1944</option>
-<option value="1945">1945</option>
-<option value="1946">1946</option>
-<option value="1947">1947</option>
-<option value="1948">1948</option>
-<option value="1949">1949</option>
-<option value="1950">1950</option>
-<option value="1951">1951</option>
-<option value="1952">1952</option>
-<option value="1953">1953</option>
-<option value="1954">1954</option>
-<option value="1955">1955</option>
-<option value="1956">1956</option>
-<option value="1957">1957</option>
-<option value="1958">1958</option>
-<option value="1959">1959</option>
-<option value="1960">1960</option>
-<option value="1961">1961</option>
-<option value="1962">1962</option>
-<option value="1963">1963</option>
-<option value="1964">1964</option>
-<option value="1965">1965</option>
-<option value="1966">1966</option>
-<option value="1967">1967</option>
-<option value="1968">1968</option>
-<option value="1969">1969</option>
-<option value="1970">1970</option>
-<option value="1971">1971</option>
-<option value="1972">1972</option>
-<option value="1973">1973</option>
-<option value="1974">1974</option>
-<option value="1975">1975</option>
-<option value="1976">1976</option>
-<option value="1977">1977</option>
-<option value="1978">1978</option>
-<option value="1979">1979</option>
-<option value="1980">1980</option>
-<option value="1981">1981</option>
-<option value="1982">1982</option>
-<option value="1983">1983</option>
-<option value="1984">1984</option>
-<option value="1985">1985</option>
-<option value="1986">1986</option>
-<option value="1987">1987</option>
-<option value="1988">1988</option>
-<option value="1989">1989</option>
-<option value="1990">1990</option>
-<option value="1991">1991</option>
-<option value="1992">1992</option>
-<option value="1993">1993</option>
-<option value="1994">1994</option>
-<option value="1995">1995</option>
-<option value="1996">1996</option>
-<option value="1997">1997</option>
-<option value="1998">1998</option>
-<option value="1999">1999</option>
-<option value="2000">2000</option>
-<option value="2001">2001</option>
-<option value="2002">2002</option>
-<option value="2003">2003</option>
-<option value="2004">2004</option>
-<option value="2005">2005</option>
-<option value="2006">2006</option>
-<option value="2007">2007</option>
-<option value="2008">2008</option>
-<option value="2009">2009</option>
-<option value="2010">2010</option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/state-pension-age">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to calculate?</td>
-    <td class="previous-question-body">
-    State Pension age - including Pension Credit qualifying age</td>
-
-  <td class="link-right">
-    <a href="/state-pension-age/y?previous_response=age">
-      Change<span class="visuallyhidden"> answer to "What would you like to calculate?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-age/age.txt b/test/artefacts/state-pension-age/age.txt
new file mode 100644
index 00000000000..6e63468c3e9
--- /dev/null
+++ b/test/artefacts/state-pension-age/age.txt
@@ -0,0 +1,12 @@
+What is your date of birth?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-age/age/1949-02-01.html b/test/artefacts/state-pension-age/age/1949-02-01.html
deleted file mode 100644
index 216d7df3eed..00000000000
--- a/test/artefacts/state-pension-age/age/1949-02-01.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check your State Pension age - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check your State Pension age
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-age/y/age/1949-02-01" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you a man or a woman?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="male" />
-        Man
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="female" />
-        Woman
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/state-pension-age">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What would you like to calculate?</td>
-    <td class="previous-question-body">
-    State Pension age - including Pension Credit qualifying age</td>
-
-  <td class="link-right">
-    <a href="/state-pension-age/y?previous_response=age">
-      Change<span class="visuallyhidden"> answer to "What would you like to calculate?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is your date of birth?</td>
-    <td class="previous-question-body">
-     1 February 1949</td>
-
-  <td class="link-right">
-    <a href="/state-pension-age/y/age?previous_response=1949-02-01">
-      Change<span class="visuallyhidden"> answer to "What is your date of birth?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-age/age/1949-02-01.txt b/test/artefacts/state-pension-age/age/1949-02-01.txt
new file mode 100644
index 00000000000..179f92a8250
--- /dev/null
+++ b/test/artefacts/state-pension-age/age/1949-02-01.txt
@@ -0,0 +1,14 @@
+Are you a man or a woman?
+
+
+
+
+
+  * male: Man
+  * female: Woman
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-age/y.html b/test/artefacts/state-pension-age/y.html
deleted file mode 100644
index 4f875ea1515..00000000000
--- a/test/artefacts/state-pension-age/y.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Check your State Pension age - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Check your State Pension age
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-age/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What would you like to calculate?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="age" />
-        State Pension age - including Pension Credit qualifying age
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="bus_pass" />
-        Bus pass age - find out when you’ll get free bus travel
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-age/y.txt b/test/artefacts/state-pension-age/y.txt
new file mode 100644
index 00000000000..82cb464b3ec
--- /dev/null
+++ b/test/artefacts/state-pension-age/y.txt
@@ -0,0 +1,14 @@
+What would you like to calculate?
+
+
+
+
+
+  * age: State Pension age - including Pension Credit qualifying age
+  * bus_pass: Bus pass age - find out when you’ll get free bus travel
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-through-partner/married.html b/test/artefacts/state-pension-through-partner/married.html
deleted file mode 100644
index 17e4b6dadcb..00000000000
--- a/test/artefacts/state-pension-through-partner/married.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Your partner’s National Insurance record and your State Pension - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Your partner’s National Insurance record and your State Pension
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-through-partner/y/married" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When will (or did) you reach state pension age?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="your_pension_age_before_specific_date" />
-        on or before 5 April 2016
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="your_pension_age_after_specific_date" />
-        on or after 6 April 2016
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/state-pension-through-partner">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What is your marital status?</td>
-    <td class="previous-question-body">
-    married or in a civil partnership</td>
-
-  <td class="link-right">
-    <a href="/state-pension-through-partner/y?previous_response=married">
-      Change<span class="visuallyhidden"> answer to "What is your marital status?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-through-partner/married.txt b/test/artefacts/state-pension-through-partner/married.txt
new file mode 100644
index 00000000000..a08c157107a
--- /dev/null
+++ b/test/artefacts/state-pension-through-partner/married.txt
@@ -0,0 +1,14 @@
+When will (or did) you reach state pension age?
+
+
+
+
+
+  * your_pension_age_before_specific_date: on or before 5 April 2016
+  * your_pension_age_after_specific_date: on or after 6 April 2016
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-through-partner/married/your_pension_age_after_specific_date/partner_pension_age_before_specific_date.html b/test/artefacts/state-pension-through-partner/married/your_pension_age_after_specific_date/partner_pension_age_before_specific_date.html
deleted file mode 100644
index eae621e5817..00000000000
--- a/test/artefacts/state-pension-through-partner/married/your_pension_age_after_specific_date/partner_pension_age_before_specific_date.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Your partner’s National Insurance record and your State Pension - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Your partner’s National Insurance record and your State Pension
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-through-partner/y/married/your_pension_age_after_specific_date/partner_pension_age_before_specific_date" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="male_gender" />
-        a man
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="female_gender" />
-        a woman
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/state-pension-through-partner">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What is your marital status?</td>
-    <td class="previous-question-body">
-    married or in a civil partnership</td>
-
-  <td class="link-right">
-    <a href="/state-pension-through-partner/y?previous_response=married">
-      Change<span class="visuallyhidden"> answer to "What is your marital status?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will (or did) you reach state pension age?</td>
-    <td class="previous-question-body">
-    on or after 6 April 2016</td>
-
-  <td class="link-right">
-    <a href="/state-pension-through-partner/y/married?previous_response=your_pension_age_after_specific_date">
-      Change<span class="visuallyhidden"> answer to "When will (or did) you reach state pension age?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will (or did) your spouse or civil partner reach state pension age?</td>
-    <td class="previous-question-body">
-    on or before 5 April 2016</td>
-
-  <td class="link-right">
-    <a href="/state-pension-through-partner/y/married/your_pension_age_after_specific_date?previous_response=partner_pension_age_before_specific_date">
-      Change<span class="visuallyhidden"> answer to "When will (or did) your spouse or civil partner reach state pension age?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-through-partner/married/your_pension_age_after_specific_date/partner_pension_age_before_specific_date.txt b/test/artefacts/state-pension-through-partner/married/your_pension_age_after_specific_date/partner_pension_age_before_specific_date.txt
new file mode 100644
index 00000000000..83230d14451
--- /dev/null
+++ b/test/artefacts/state-pension-through-partner/married/your_pension_age_after_specific_date/partner_pension_age_before_specific_date.txt
@@ -0,0 +1,14 @@
+Are you:
+
+
+
+
+
+  * male_gender: a man
+  * female_gender: a woman
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-through-partner/married/your_pension_age_before_specific_date.html b/test/artefacts/state-pension-through-partner/married/your_pension_age_before_specific_date.html
deleted file mode 100644
index 7b2a2c485b5..00000000000
--- a/test/artefacts/state-pension-through-partner/married/your_pension_age_before_specific_date.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Your partner’s National Insurance record and your State Pension - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Your partner’s National Insurance record and your State Pension
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-through-partner/y/married/your_pension_age_before_specific_date" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When will (or did) your spouse or civil partner reach state pension age?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="partner_pension_age_before_specific_date" />
-        on or before 5 April 2016
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="partner_pension_age_after_specific_date" />
-        on or after 6 April 2016
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/state-pension-through-partner">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What is your marital status?</td>
-    <td class="previous-question-body">
-    married or in a civil partnership</td>
-
-  <td class="link-right">
-    <a href="/state-pension-through-partner/y?previous_response=married">
-      Change<span class="visuallyhidden"> answer to "What is your marital status?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When will (or did) you reach state pension age?</td>
-    <td class="previous-question-body">
-    on or before 5 April 2016</td>
-
-  <td class="link-right">
-    <a href="/state-pension-through-partner/y/married?previous_response=your_pension_age_before_specific_date">
-      Change<span class="visuallyhidden"> answer to "When will (or did) you reach state pension age?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-through-partner/married/your_pension_age_before_specific_date.txt b/test/artefacts/state-pension-through-partner/married/your_pension_age_before_specific_date.txt
new file mode 100644
index 00000000000..95d729dce0c
--- /dev/null
+++ b/test/artefacts/state-pension-through-partner/married/your_pension_age_before_specific_date.txt
@@ -0,0 +1,14 @@
+When will (or did) your spouse or civil partner reach state pension age?
+
+
+
+
+
+  * partner_pension_age_before_specific_date: on or before 5 April 2016
+  * partner_pension_age_after_specific_date: on or after 6 April 2016
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-through-partner/y.html b/test/artefacts/state-pension-through-partner/y.html
deleted file mode 100644
index e4d43f782fd..00000000000
--- a/test/artefacts/state-pension-through-partner/y.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Your partner’s National Insurance record and your State Pension - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Your partner’s National Insurance record and your State Pension
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-through-partner/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is your marital status?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="married" />
-        married or in a civil partnership
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="widowed" />
-        widowed
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="divorced" />
-        divorced or have dissolved your civil partnership
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-through-partner/y.txt b/test/artefacts/state-pension-through-partner/y.txt
new file mode 100644
index 00000000000..90515746961
--- /dev/null
+++ b/test/artefacts/state-pension-through-partner/y.txt
@@ -0,0 +1,15 @@
+What is your marital status?
+
+
+
+
+
+  * married: married or in a civil partnership
+  * widowed: widowed
+  * divorced: divorced or have dissolved your civil partnership
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-topup/1912-10-12.html b/test/artefacts/state-pension-topup/1912-10-12.html
deleted file mode 100644
index 26c473ea6a9..00000000000
--- a/test/artefacts/state-pension-topup/1912-10-12.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>State Pension top up calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        State Pension top up calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-topup/y/1912-10-12" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is your gender?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="male" />
-        Male
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="female" />
-        Female
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/state-pension-topup">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What is your date of birth?</td>
-    <td class="previous-question-body">
-    12 October 1912</td>
-
-  <td class="link-right">
-    <a href="/state-pension-topup/y?previous_response=1912-10-12">
-      Change<span class="visuallyhidden"> answer to "What is your date of birth?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-topup/1912-10-12.txt b/test/artefacts/state-pension-topup/1912-10-12.txt
new file mode 100644
index 00000000000..3118ca2d9ed
--- /dev/null
+++ b/test/artefacts/state-pension-topup/1912-10-12.txt
@@ -0,0 +1,14 @@
+What is your gender?
+
+
+
+
+
+  * male: Male
+  * female: Female
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-topup/1912-10-12/male.html b/test/artefacts/state-pension-topup/1912-10-12/male.html
deleted file mode 100644
index c9b7f6e7551..00000000000
--- a/test/artefacts/state-pension-topup/1912-10-12/male.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>State Pension top up calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        State Pension top up calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-topup/y/1912-10-12/male" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much extra State Pension would you like to get per week?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">Enter a number between 1 and 25.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/state-pension-topup">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What is your date of birth?</td>
-    <td class="previous-question-body">
-    12 October 1912</td>
-
-  <td class="link-right">
-    <a href="/state-pension-topup/y?previous_response=1912-10-12">
-      Change<span class="visuallyhidden"> answer to "What is your date of birth?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What is your gender?</td>
-    <td class="previous-question-body">
-    Male</td>
-
-  <td class="link-right">
-    <a href="/state-pension-topup/y/1912-10-12?previous_response=male">
-      Change<span class="visuallyhidden"> answer to "What is your gender?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-topup/1912-10-12/male.txt b/test/artefacts/state-pension-topup/1912-10-12/male.txt
new file mode 100644
index 00000000000..29dd3b0b291
--- /dev/null
+++ b/test/artefacts/state-pension-topup/1912-10-12/male.txt
@@ -0,0 +1,12 @@
+How much extra State Pension would you like to get per week?
+
+
+
+Enter a number between 1 and 25.
+
+
+
+
+
+
+
diff --git a/test/artefacts/state-pension-topup/y.html b/test/artefacts/state-pension-topup/y.html
deleted file mode 100644
index 32133491477..00000000000
--- a/test/artefacts/state-pension-topup/y.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>State Pension top up calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        State Pension top up calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/state-pension-topup/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What is your date of birth?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_day">Day
-      <select id="response_day" name="response[day]">
-<option value=""></option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-</select>
-
-    </label>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="1893">1893</option>
-<option value="1894">1894</option>
-<option value="1895">1895</option>
-<option value="1896">1896</option>
-<option value="1897">1897</option>
-<option value="1898">1898</option>
-<option value="1899">1899</option>
-<option value="1900">1900</option>
-<option value="1901">1901</option>
-<option value="1902">1902</option>
-<option value="1903">1903</option>
-<option value="1904">1904</option>
-<option value="1905">1905</option>
-<option value="1906">1906</option>
-<option value="1907">1907</option>
-<option value="1908">1908</option>
-<option value="1909">1909</option>
-<option value="1910">1910</option>
-<option value="1911">1911</option>
-<option value="1912">1912</option>
-<option value="1913">1913</option>
-<option value="1914">1914</option>
-<option value="1915">1915</option>
-<option value="1916">1916</option>
-<option value="1917">1917</option>
-<option value="1918">1918</option>
-<option value="1919">1919</option>
-<option value="1920">1920</option>
-<option value="1921">1921</option>
-<option value="1922">1922</option>
-<option value="1923">1923</option>
-<option value="1924">1924</option>
-<option value="1925">1925</option>
-<option value="1926">1926</option>
-<option value="1927">1927</option>
-<option value="1928">1928</option>
-<option value="1929">1929</option>
-<option value="1930">1930</option>
-<option value="1931">1931</option>
-<option value="1932">1932</option>
-<option value="1933">1933</option>
-<option value="1934">1934</option>
-<option value="1935">1935</option>
-<option value="1936">1936</option>
-<option value="1937">1937</option>
-<option value="1938">1938</option>
-<option value="1939">1939</option>
-<option value="1940">1940</option>
-<option value="1941">1941</option>
-<option value="1942">1942</option>
-<option value="1943">1943</option>
-<option value="1944">1944</option>
-<option value="1945">1945</option>
-<option value="1946">1946</option>
-<option value="1947">1947</option>
-<option value="1948">1948</option>
-<option value="1949">1949</option>
-<option value="1950">1950</option>
-<option value="1951">1951</option>
-<option value="1952">1952</option>
-<option value="1953">1953</option>
-<option value="1954">1954</option>
-<option value="1955">1955</option>
-<option value="1956">1956</option>
-<option value="1957">1957</option>
-<option value="1958">1958</option>
-<option value="1959">1959</option>
-<option value="1960">1960</option>
-<option value="1961">1961</option>
-<option value="1962">1962</option>
-<option value="1963">1963</option>
-<option value="1964">1964</option>
-<option value="1965">1965</option>
-<option value="1966">1966</option>
-<option value="1967">1967</option>
-<option value="1968">1968</option>
-<option value="1969">1969</option>
-<option value="1970">1970</option>
-<option value="1971">1971</option>
-<option value="1972">1972</option>
-<option value="1973">1973</option>
-<option value="1974">1974</option>
-<option value="1975">1975</option>
-<option value="1976">1976</option>
-<option value="1977">1977</option>
-<option value="1978">1978</option>
-<option value="1979">1979</option>
-<option value="1980">1980</option>
-<option value="1981">1981</option>
-<option value="1982">1982</option>
-<option value="1983">1983</option>
-<option value="1984">1984</option>
-<option value="1985">1985</option>
-<option value="1986">1986</option>
-<option value="1987">1987</option>
-<option value="1988">1988</option>
-<option value="1989">1989</option>
-<option value="1990">1990</option>
-<option value="1991">1991</option>
-<option value="1992">1992</option>
-<option value="1993">1993</option>
-<option value="1994">1994</option>
-<option value="1995">1995</option>
-<option value="1996">1996</option>
-<option value="1997">1997</option>
-<option value="1998">1998</option>
-<option value="1999">1999</option>
-<option value="2000">2000</option>
-<option value="2001">2001</option>
-<option value="2002">2002</option>
-<option value="2003">2003</option>
-<option value="2004">2004</option>
-<option value="2005">2005</option>
-<option value="2006">2006</option>
-<option value="2007">2007</option>
-<option value="2008">2008</option>
-<option value="2009">2009</option>
-<option value="2010">2010</option>
-<option value="2011">2011</option>
-<option value="2012">2012</option>
-<option value="2013">2013</option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/state-pension-topup/y.txt b/test/artefacts/state-pension-topup/y.txt
new file mode 100644
index 00000000000..6e63468c3e9
--- /dev/null
+++ b/test/artefacts/state-pension-topup/y.txt
@@ -0,0 +1,12 @@
+What is your date of birth?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-calculator/2015-2016.html b/test/artefacts/student-finance-calculator/2015-2016.html
deleted file mode 100644
index 8022426e867..00000000000
--- a/test/artefacts/student-finance-calculator/2015-2016.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-calculator/y/2015-2016" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What type of student are you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="uk-full-time" />
-        UK student full-time
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="uk-part-time" />
-        UK student part-time
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="eu-full-time" />
-        EU student full-time
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="eu-part-time" />
-        EU student part-time
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When does your course start?</td>
-    <td class="previous-question-body">
-    Between September 2015 and August 2016</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y?previous_response=2015-2016">
-      Change<span class="visuallyhidden"> answer to "When does your course start?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-calculator/2015-2016.txt b/test/artefacts/student-finance-calculator/2015-2016.txt
new file mode 100644
index 00000000000..5a27b44cca1
--- /dev/null
+++ b/test/artefacts/student-finance-calculator/2015-2016.txt
@@ -0,0 +1,16 @@
+What type of student are you?
+
+
+
+
+
+  * uk-full-time: UK student full-time
+  * uk-part-time: UK student part-time
+  * eu-full-time: EU student full-time
+  * eu-part-time: EU student part-time
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time.html b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time.html
deleted file mode 100644
index d06237309a8..00000000000
--- a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-calculator/y/2015-2016/uk-full-time" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How much are your tuition fees per year?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">The maximum is £9,000 for full-time students and £6,750 for part-time students.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When does your course start?</td>
-    <td class="previous-question-body">
-    Between September 2015 and August 2016</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y?previous_response=2015-2016">
-      Change<span class="visuallyhidden"> answer to "When does your course start?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What type of student are you?</td>
-    <td class="previous-question-body">
-    UK student full-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016?previous_response=uk-full-time">
-      Change<span class="visuallyhidden"> answer to "What type of student are you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time.txt b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time.txt
new file mode 100644
index 00000000000..c72ec6f25b7
--- /dev/null
+++ b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time.txt
@@ -0,0 +1,12 @@
+How much are your tuition fees per year?
+
+
+
+The maximum is £9,000 for full-time students and £6,750 for part-time students.
+
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home.html b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home.html
deleted file mode 100644
index 0158d14daff..00000000000
--- a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0/at-home" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What's your annual household income?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">This is your parents’ or partner’s gross (pre-tax) income plus your own. It affects how much help you'll get with living costs.</p>
-
-    <div class="">
-
-      <label for="response">&pound; <input type="text" name="response" id="response" size="5" /></label>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When does your course start?</td>
-    <td class="previous-question-body">
-    Between September 2015 and August 2016</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y?previous_response=2015-2016">
-      Change<span class="visuallyhidden"> answer to "When does your course start?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What type of student are you?</td>
-    <td class="previous-question-body">
-    UK student full-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016?previous_response=uk-full-time">
-      Change<span class="visuallyhidden"> answer to "What type of student are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much are your tuition fees per year?</td>
-    <td class="previous-question-body">
-    £6,000</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time?previous_response=6000.0">
-      Change<span class="visuallyhidden"> answer to "How much are your tuition fees per year?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Where will you live while studying?</td>
-    <td class="previous-question-body">
-    Living with parents</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0?previous_response=at-home">
-      Change<span class="visuallyhidden"> answer to "Where will you live while studying?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home.txt b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home.txt
new file mode 100644
index 00000000000..75c35e321a2
--- /dev/null
+++ b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home.txt
@@ -0,0 +1,12 @@
+What's your annual household income?
+
+
+
+This is your parents’ or partner’s gross (pre-tax) income plus your own. It affects how much help you'll get with living costs.
+
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.0/children-under-17,dependant-adult,has-disability,low-income.html b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.0/children-under-17,dependant-adult,has-disability,low-income.html
deleted file mode 100644
index 474b1479b41..00000000000
--- a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.0/children-under-17,dependant-adult,has-disability,low-income.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0/at-home/100000.0/children-under-17,dependant-adult,has-disability,low-income" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you studying one of these courses?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="teacher-training" />
-        Teacher training
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="dental-medical-healthcare" />
-        Dental, medical or healthcare
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="social-work" />
-        Social work
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="none-of-the-above" />
-         None of these
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When does your course start?</td>
-    <td class="previous-question-body">
-    Between September 2015 and August 2016</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y?previous_response=2015-2016">
-      Change<span class="visuallyhidden"> answer to "When does your course start?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What type of student are you?</td>
-    <td class="previous-question-body">
-    UK student full-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016?previous_response=uk-full-time">
-      Change<span class="visuallyhidden"> answer to "What type of student are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much are your tuition fees per year?</td>
-    <td class="previous-question-body">
-    £6,000</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time?previous_response=6000.0">
-      Change<span class="visuallyhidden"> answer to "How much are your tuition fees per year?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Where will you live while studying?</td>
-    <td class="previous-question-body">
-    Living with parents</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0?previous_response=at-home">
-      Change<span class="visuallyhidden"> answer to "Where will you live while studying?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's your annual household income?</td>
-    <td class="previous-question-body">
-    £100,000</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0/at-home?previous_response=100000.0">
-      Change<span class="visuallyhidden"> answer to "What's your annual household income?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do any of the following apply? (you might get extra funding.)</td>
-    <td class="previous-question-body"><ul>
-      <li>You’ve got children under 17</li>
-      <li>An adult depends on you financially</li>
-      <li>You have a disability, health condition or learning difficulty, eg dyslexia</li>
-      <li>You’re on low income, eg you find it hard to pay for basics like food and accommodation</li>
-    </ul></td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0/at-home/100000.0?previous_response=children-under-17%2Cdependant-adult%2Chas-disability%2Clow-income">
-      Change<span class="visuallyhidden"> answer to "Do any of the following apply? (you might get extra funding.)"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.0/children-under-17,dependant-adult,has-disability,low-income.txt b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.0/children-under-17,dependant-adult,has-disability,low-income.txt
new file mode 100644
index 00000000000..e6f54178d1f
--- /dev/null
+++ b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.0/children-under-17,dependant-adult,has-disability,low-income.txt
@@ -0,0 +1,16 @@
+Are you studying one of these courses?
+
+
+
+
+
+  * teacher-training: Teacher training
+  * dental-medical-healthcare: Dental, medical or healthcare
+  * social-work: Social work
+  * none-of-the-above:  None of these
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.html b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.html
deleted file mode 100644
index 1b61183be3a..00000000000
--- a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0/at-home/100000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do any of the following apply? (you might get extra funding.)
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="children-under-17" />
-        You’ve got children under 17
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="dependant-adult" />
-        An adult depends on you financially
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="has-disability" />
-        You have a disability, health condition or learning difficulty, eg dyslexia
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="checkbox" name="response[]" id="response_3" value="low-income" />
-        You’re on low income, eg you find it hard to pay for basics like food and accommodation
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="checkbox" name="response[]" id="response_4" value="no" />
-        None of these
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When does your course start?</td>
-    <td class="previous-question-body">
-    Between September 2015 and August 2016</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y?previous_response=2015-2016">
-      Change<span class="visuallyhidden"> answer to "When does your course start?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What type of student are you?</td>
-    <td class="previous-question-body">
-    UK student full-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016?previous_response=uk-full-time">
-      Change<span class="visuallyhidden"> answer to "What type of student are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much are your tuition fees per year?</td>
-    <td class="previous-question-body">
-    £6,000</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time?previous_response=6000.0">
-      Change<span class="visuallyhidden"> answer to "How much are your tuition fees per year?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Where will you live while studying?</td>
-    <td class="previous-question-body">
-    Living with parents</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0?previous_response=at-home">
-      Change<span class="visuallyhidden"> answer to "Where will you live while studying?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What's your annual household income?</td>
-    <td class="previous-question-body">
-    £100,000</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0/at-home?previous_response=100000.0">
-      Change<span class="visuallyhidden"> answer to "What's your annual household income?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.txt b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.txt
new file mode 100644
index 00000000000..71ffbb4ef3f
--- /dev/null
+++ b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.0/at-home/100000.txt
@@ -0,0 +1,17 @@
+Do any of the following apply? (you might get extra funding.)
+
+
+
+
+
+  * children-under-17: You’ve got children under 17
+  * dependant-adult: An adult depends on you financially
+  * has-disability: You have a disability, health condition or learning difficulty, eg dyslexia
+  * low-income: You’re on low income, eg you find it hard to pay for basics like food and accommodation
+  * no: None of these
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.html b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.html
deleted file mode 100644
index 5332b3f67b4..00000000000
--- a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-calculator/y/2015-2016/uk-full-time/6000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Where will you live while studying?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="at-home" />
-        Living with parents
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="away-outside-london" />
-        Not living with parents and studying outside of London
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="away-in-london" />
-        Not living with parents and studying in London
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When does your course start?</td>
-    <td class="previous-question-body">
-    Between September 2015 and August 2016</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y?previous_response=2015-2016">
-      Change<span class="visuallyhidden"> answer to "When does your course start?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What type of student are you?</td>
-    <td class="previous-question-body">
-    UK student full-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016?previous_response=uk-full-time">
-      Change<span class="visuallyhidden"> answer to "What type of student are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much are your tuition fees per year?</td>
-    <td class="previous-question-body">
-    £6,000</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-full-time?previous_response=6000.0">
-      Change<span class="visuallyhidden"> answer to "How much are your tuition fees per year?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.txt b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.txt
new file mode 100644
index 00000000000..7f298c70647
--- /dev/null
+++ b/test/artefacts/student-finance-calculator/2015-2016/uk-full-time/6000.txt
@@ -0,0 +1,15 @@
+Where will you live while studying?
+
+
+
+
+
+  * at-home: Living with parents
+  * away-outside-london: Not living with parents and studying outside of London
+  * away-in-london: Not living with parents and studying in London
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-part-time/6000.html b/test/artefacts/student-finance-calculator/2015-2016/uk-part-time/6000.html
deleted file mode 100644
index 4d0562b018b..00000000000
--- a/test/artefacts/student-finance-calculator/2015-2016/uk-part-time/6000.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-calculator/y/2015-2016/uk-part-time/6000.0" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do any of the following apply (you might get extra funding)?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="checkbox" name="response[]" id="response_0" value="has-disability" />
-        You have a disability, health condition or learning difficulty, eg dyslexia
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="checkbox" name="response[]" id="response_1" value="low-income" />
-        You’re on a low income, eg you find it hard to pay for food and accommodation
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="checkbox" name="response[]" id="response_2" value="no" />
-        None of these
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-calculator">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When does your course start?</td>
-    <td class="previous-question-body">
-    Between September 2015 and August 2016</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y?previous_response=2015-2016">
-      Change<span class="visuallyhidden"> answer to "When does your course start?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What type of student are you?</td>
-    <td class="previous-question-body">
-    UK student part-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016?previous_response=uk-part-time">
-      Change<span class="visuallyhidden"> answer to "What type of student are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How much are your tuition fees per year?</td>
-    <td class="previous-question-body">
-    £6,000</td>
-
-  <td class="link-right">
-    <a href="/student-finance-calculator/y/2015-2016/uk-part-time?previous_response=6000.0">
-      Change<span class="visuallyhidden"> answer to "How much are your tuition fees per year?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-calculator/2015-2016/uk-part-time/6000.txt b/test/artefacts/student-finance-calculator/2015-2016/uk-part-time/6000.txt
new file mode 100644
index 00000000000..15fe352959d
--- /dev/null
+++ b/test/artefacts/student-finance-calculator/2015-2016/uk-part-time/6000.txt
@@ -0,0 +1,15 @@
+Do any of the following apply (you might get extra funding)?
+
+
+
+
+
+  * has-disability: You have a disability, health condition or learning difficulty, eg dyslexia
+  * low-income: You’re on a low income, eg you find it hard to pay for food and accommodation
+  * no: None of these
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-calculator/y.html b/test/artefacts/student-finance-calculator/y.html
deleted file mode 100644
index 2ddaf80e4cd..00000000000
--- a/test/artefacts/student-finance-calculator/y.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-calculator/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When does your course start?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="2015-2016" />
-        Between September 2015 and August 2016
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="2016-2017" />
-        Between September 2016 and August 2017
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-calculator/y.txt b/test/artefacts/student-finance-calculator/y.txt
new file mode 100644
index 00000000000..70ab59849cf
--- /dev/null
+++ b/test/artefacts/student-finance-calculator/y.txt
@@ -0,0 +1,14 @@
+When does your course start?
+
+
+
+
+
+  * 2015-2016: Between September 2015 and August 2016
+  * 2016-2017: Between September 2016 and August 2017
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-forms/uk-full-time.html b/test/artefacts/student-finance-forms/uk-full-time.html
deleted file mode 100644
index b18fa49b2e7..00000000000
--- a/test/artefacts/student-finance-forms/uk-full-time.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance forms - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance forms
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-forms/y/uk-full-time" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What do you need the form for?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="apply-loans-grants" />
-        Apply for student loans and grants
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="proof-identity" />
-        Send proof of identity
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="income-details" />
-        Send parent or partner’s income detail - eg PFF2 or CYI
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="apply-dsa" />
-        Apply for Disabled Students’ Allowances
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="dsa-expenses" />
-        Claim Disabled Students’ Allowances expenses
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="apply-ccg" />
-        Apply for Childcare Grant
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="ccg-expenses" />
-        Childcare Grant costs confirmation
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="radio" name="response" id="response_7" value="travel-grant" />
-        Travel Grant
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-forms">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What type of a student are you?</td>
-    <td class="previous-question-body">
-    English student - full-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y?previous_response=uk-full-time">
-      Change<span class="visuallyhidden"> answer to "What type of a student are you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-forms/uk-full-time.txt b/test/artefacts/student-finance-forms/uk-full-time.txt
new file mode 100644
index 00000000000..d83049ee82f
--- /dev/null
+++ b/test/artefacts/student-finance-forms/uk-full-time.txt
@@ -0,0 +1,20 @@
+What do you need the form for?
+
+
+
+
+
+  * apply-loans-grants: Apply for student loans and grants
+  * proof-identity: Send proof of identity
+  * income-details: Send parent or partner’s income detail - eg PFF2 or CYI
+  * apply-dsa: Apply for Disabled Students’ Allowances
+  * dsa-expenses: Claim Disabled Students’ Allowances expenses
+  * apply-ccg: Apply for Childcare Grant
+  * ccg-expenses: Childcare Grant costs confirmation
+  * travel-grant: Travel Grant
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.html b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.html
deleted file mode 100644
index cebfafa70e5..00000000000
--- a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance forms - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance forms
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-forms/y/uk-full-time/apply-loans-grants" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What academic year do you want funding for?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="year-1617" />
-        2016 to 2017
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="year-1516" />
-        2015 to 2016
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-forms">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What type of a student are you?</td>
-    <td class="previous-question-body">
-    English student - full-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y?previous_response=uk-full-time">
-      Change<span class="visuallyhidden"> answer to "What type of a student are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What do you need the form for?</td>
-    <td class="previous-question-body">
-    Apply for student loans and grants</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y/uk-full-time?previous_response=apply-loans-grants">
-      Change<span class="visuallyhidden"> answer to "What do you need the form for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.txt b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.txt
new file mode 100644
index 00000000000..5858d01e247
--- /dev/null
+++ b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.txt
@@ -0,0 +1,14 @@
+What academic year do you want funding for?
+
+
+
+
+
+  * year-1617: 2016 to 2017
+  * year-1516: 2015 to 2016
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1617.html b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1617.html
deleted file mode 100644
index dd30c394cc1..00000000000
--- a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1617.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance forms - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance forms
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-forms/y/uk-full-time/apply-loans-grants/year-1617" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you a continuing student?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You’re usually a continuing student if you got student finance last year.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="continuing-student" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="new-student" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-forms">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What type of a student are you?</td>
-    <td class="previous-question-body">
-    English student - full-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y?previous_response=uk-full-time">
-      Change<span class="visuallyhidden"> answer to "What type of a student are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What do you need the form for?</td>
-    <td class="previous-question-body">
-    Apply for student loans and grants</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y/uk-full-time?previous_response=apply-loans-grants">
-      Change<span class="visuallyhidden"> answer to "What do you need the form for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What academic year do you want funding for?</td>
-    <td class="previous-question-body">
-    2016 to 2017</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y/uk-full-time/apply-loans-grants?previous_response=year-1617">
-      Change<span class="visuallyhidden"> answer to "What academic year do you want funding for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1617.txt b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1617.txt
new file mode 100644
index 00000000000..bce9c1f753f
--- /dev/null
+++ b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1617.txt
@@ -0,0 +1,14 @@
+Are you a continuing student?
+
+
+
+You’re usually a continuing student if you got student finance last year.
+
+  * continuing-student: Yes
+  * new-student: No
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-forms/uk-part-time.html b/test/artefacts/student-finance-forms/uk-part-time.html
deleted file mode 100644
index 142cdf1e94b..00000000000
--- a/test/artefacts/student-finance-forms/uk-part-time.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance forms - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance forms
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-forms/y/uk-part-time" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What do you need the form for?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="apply-loans-grants" />
-        Apply for student loans and grants
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="proof-identity" />
-        Send proof of identity
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="apply-dsa" />
-        Apply for Disabled Students’ Allowances
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="dsa-expenses" />
-        Claim Disabled Students’ Allowances expenses
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-forms">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What type of a student are you?</td>
-    <td class="previous-question-body">
-    English student - part-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y?previous_response=uk-part-time">
-      Change<span class="visuallyhidden"> answer to "What type of a student are you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-forms/uk-part-time.txt b/test/artefacts/student-finance-forms/uk-part-time.txt
new file mode 100644
index 00000000000..82f145393a5
--- /dev/null
+++ b/test/artefacts/student-finance-forms/uk-part-time.txt
@@ -0,0 +1,16 @@
+What do you need the form for?
+
+
+
+
+
+  * apply-loans-grants: Apply for student loans and grants
+  * proof-identity: Send proof of identity
+  * apply-dsa: Apply for Disabled Students’ Allowances
+  * dsa-expenses: Claim Disabled Students’ Allowances expenses
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants.html b/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants.html
deleted file mode 100644
index 68b536e7129..00000000000
--- a/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance forms - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance forms
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-forms/y/uk-part-time/apply-loans-grants" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What academic year do you want funding for?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="year-1617" />
-        2016 to 2017
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="year-1516" />
-        2015 to 2016
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-forms">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What type of a student are you?</td>
-    <td class="previous-question-body">
-    English student - part-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y?previous_response=uk-part-time">
-      Change<span class="visuallyhidden"> answer to "What type of a student are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What do you need the form for?</td>
-    <td class="previous-question-body">
-    Apply for student loans and grants</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y/uk-part-time?previous_response=apply-loans-grants">
-      Change<span class="visuallyhidden"> answer to "What do you need the form for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants.txt b/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants.txt
new file mode 100644
index 00000000000..5858d01e247
--- /dev/null
+++ b/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants.txt
@@ -0,0 +1,14 @@
+What academic year do you want funding for?
+
+
+
+
+
+  * year-1617: 2016 to 2017
+  * year-1516: 2015 to 2016
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/continuing-student.html b/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/continuing-student.html
deleted file mode 100644
index 640c4ecc864..00000000000
--- a/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/continuing-student.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance forms - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance forms
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-forms/y/uk-part-time/apply-loans-grants/year-1617/continuing-student" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did your part-time course start before 1 September 2012?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="course-start-before-01092012" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="course-start-after-01092012" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/student-finance-forms">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What type of a student are you?</td>
-    <td class="previous-question-body">
-    English student - part-time</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y?previous_response=uk-part-time">
-      Change<span class="visuallyhidden"> answer to "What type of a student are you?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What do you need the form for?</td>
-    <td class="previous-question-body">
-    Apply for student loans and grants</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y/uk-part-time?previous_response=apply-loans-grants">
-      Change<span class="visuallyhidden"> answer to "What do you need the form for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">What academic year do you want funding for?</td>
-    <td class="previous-question-body">
-    2016 to 2017</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y/uk-part-time/apply-loans-grants?previous_response=year-1617">
-      Change<span class="visuallyhidden"> answer to "What academic year do you want funding for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you a continuing student?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/student-finance-forms/y/uk-part-time/apply-loans-grants/year-1617?previous_response=continuing-student">
-      Change<span class="visuallyhidden"> answer to "Are you a continuing student?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/continuing-student.txt b/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/continuing-student.txt
new file mode 100644
index 00000000000..c49724945c3
--- /dev/null
+++ b/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/continuing-student.txt
@@ -0,0 +1,14 @@
+Did your part-time course start before 1 September 2012?
+
+
+
+
+
+  * course-start-before-01092012: Yes
+  * course-start-after-01092012: No
+
+
+
+
+
+
diff --git a/test/artefacts/student-finance-forms/y.html b/test/artefacts/student-finance-forms/y.html
deleted file mode 100644
index 754c6a51d76..00000000000
--- a/test/artefacts/student-finance-forms/y.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Student finance forms - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Student finance forms
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/student-finance-forms/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What type of a student are you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="uk-full-time" />
-        English student - full-time
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="uk-part-time" />
-        English student - part-time
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="eu-full-time" />
-        EU student - full-time
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="eu-part-time" />
-        EU student - part-time
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/student-finance-forms/y.txt b/test/artefacts/student-finance-forms/y.txt
new file mode 100644
index 00000000000..5609e9ed68a
--- /dev/null
+++ b/test/artefacts/student-finance-forms/y.txt
@@ -0,0 +1,16 @@
+What type of a student are you?
+
+
+
+
+
+  * uk-full-time: English student - full-time
+  * uk-part-time: English student - part-time
+  * eu-full-time: EU student - full-time
+  * eu-part-time: EU student - part-time
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/bus.html b/test/artefacts/towing-rules/bus.html
deleted file mode 100644
index b43ae3d28a8..00000000000
--- a/test/artefacts/towing-rules/bus.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/bus" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you already have a full category D bus licence?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Bus (category D)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=bus">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/bus.txt b/test/artefacts/towing-rules/bus.txt
new file mode 100644
index 00000000000..5ff8fe7bf5b
--- /dev/null
+++ b/test/artefacts/towing-rules/bus.txt
@@ -0,0 +1,14 @@
+Do you already have a full category D bus licence?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/bus/no.html b/test/artefacts/towing-rules/bus/no.html
deleted file mode 100644
index d5413ff55ad..00000000000
--- a/test/artefacts/towing-rules/bus/no.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/bus/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old are you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="under-21" />
-        Under 21
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="21-or-over" />
-        21 or over
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Bus (category D)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=bus">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a full category D bus licence?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/bus?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you already have a full category D bus licence?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/bus/no.txt b/test/artefacts/towing-rules/bus/no.txt
new file mode 100644
index 00000000000..5350ca126bf
--- /dev/null
+++ b/test/artefacts/towing-rules/bus/no.txt
@@ -0,0 +1,14 @@
+How old are you?
+
+
+
+
+
+  * under-21: Under 21
+  * 21-or-over: 21 or over
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/car-or-light-vehicle.html b/test/artefacts/towing-rules/car-or-light-vehicle.html
deleted file mode 100644
index 303c02829bf..00000000000
--- a/test/artefacts/towing-rules/car-or-light-vehicle.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/car-or-light-vehicle" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you already have a driving licence with any of the following entitlements on it:
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>C1+E (towing with a medium sized vehicle)</li>
-  <li>C+E (towing with a large vehicle)</li>
-  <li>D1+E (towing with a minibus)</li>
-  <li>D+E (towing with a bus)</li>
-</ul>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Car (category B)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=car-or-light-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/car-or-light-vehicle.txt b/test/artefacts/towing-rules/car-or-light-vehicle.txt
new file mode 100644
index 00000000000..2ef4d55d566
--- /dev/null
+++ b/test/artefacts/towing-rules/car-or-light-vehicle.txt
@@ -0,0 +1,18 @@
+Do you already have a driving licence with any of the following entitlements on it:
+
+- C1+E (towing with a medium sized vehicle)
+- C+E (towing with a large vehicle)
+- D1+E (towing with a minibus)
+- D+E (towing with a bus)
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/car-or-light-vehicle/no.html b/test/artefacts/towing-rules/car-or-light-vehicle/no.html
deleted file mode 100644
index fb7fb97723b..00000000000
--- a/test/artefacts/towing-rules/car-or-light-vehicle/no.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/car-or-light-vehicle/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When did you pass your car driving test?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="licence-issued-before-19-Jan-2013" />
-        Before 19 January 2013
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="licence-issued-after-19-Jan-2013" />
-        From 19 January 2013
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Car (category B)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=car-or-light-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a driving licence with any of the following entitlements on it:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/car-or-light-vehicle?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you already have a driving licence with any of the following entitlements on it:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/car-or-light-vehicle/no.txt b/test/artefacts/towing-rules/car-or-light-vehicle/no.txt
new file mode 100644
index 00000000000..4a12f660bc1
--- /dev/null
+++ b/test/artefacts/towing-rules/car-or-light-vehicle/no.txt
@@ -0,0 +1,14 @@
+When did you pass your car driving test?
+
+
+
+
+
+  * licence-issued-before-19-Jan-2013: Before 19 January 2013
+  * licence-issued-after-19-Jan-2013: From 19 January 2013
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/car-or-light-vehicle/yes.html b/test/artefacts/towing-rules/car-or-light-vehicle/yes.html
deleted file mode 100644
index 91126362aef..00000000000
--- a/test/artefacts/towing-rules/car-or-light-vehicle/yes.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/car-or-light-vehicle/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When did you get this entitlement on your licence?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="before-19-Jan-2013" />
-        Before 19 January 2013
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="after-19-Jan-2013" />
-        From 19 January 2013
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Car (category B)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=car-or-light-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a driving licence with any of the following entitlements on it:</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/car-or-light-vehicle?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you already have a driving licence with any of the following entitlements on it:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/car-or-light-vehicle/yes.txt b/test/artefacts/towing-rules/car-or-light-vehicle/yes.txt
new file mode 100644
index 00000000000..94589d3cc77
--- /dev/null
+++ b/test/artefacts/towing-rules/car-or-light-vehicle/yes.txt
@@ -0,0 +1,14 @@
+When did you get this entitlement on your licence?
+
+
+
+
+
+  * before-19-Jan-2013: Before 19 January 2013
+  * after-19-Jan-2013: From 19 January 2013
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/large-vehicle.html b/test/artefacts/towing-rules/large-vehicle.html
deleted file mode 100644
index 45c4da62499..00000000000
--- a/test/artefacts/towing-rules/large-vehicle.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/large-vehicle" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you already have a category C large vehicle licence?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Large vehicle (category C)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=large-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/large-vehicle.txt b/test/artefacts/towing-rules/large-vehicle.txt
new file mode 100644
index 00000000000..e3e24dca040
--- /dev/null
+++ b/test/artefacts/towing-rules/large-vehicle.txt
@@ -0,0 +1,14 @@
+Do you already have a category C large vehicle licence?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/large-vehicle/no.html b/test/artefacts/towing-rules/large-vehicle/no.html
deleted file mode 100644
index e3df7002351..00000000000
--- a/test/artefacts/towing-rules/large-vehicle/no.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/large-vehicle/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old are you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="under-21" />
-        Under 21
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="21-or-over" />
-        21 or over
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Large vehicle (category C)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=large-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a category C large vehicle licence?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/large-vehicle?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you already have a category C large vehicle licence?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/large-vehicle/no.txt b/test/artefacts/towing-rules/large-vehicle/no.txt
new file mode 100644
index 00000000000..5350ca126bf
--- /dev/null
+++ b/test/artefacts/towing-rules/large-vehicle/no.txt
@@ -0,0 +1,14 @@
+How old are you?
+
+
+
+
+
+  * under-21: Under 21
+  * 21-or-over: 21 or over
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle.html b/test/artefacts/towing-rules/medium-sized-vehicle.html
deleted file mode 100644
index cd38504ad8e..00000000000
--- a/test/artefacts/towing-rules/medium-sized-vehicle.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/medium-sized-vehicle" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you already have a C1 medium-sized vehicle licence?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Medium-sized vehicle (category C1)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=medium-sized-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle.txt b/test/artefacts/towing-rules/medium-sized-vehicle.txt
new file mode 100644
index 00000000000..df15abdd788
--- /dev/null
+++ b/test/artefacts/towing-rules/medium-sized-vehicle.txt
@@ -0,0 +1,14 @@
+Do you already have a C1 medium-sized vehicle licence?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle/no.html b/test/artefacts/towing-rules/medium-sized-vehicle/no.html
deleted file mode 100644
index e1575e565a0..00000000000
--- a/test/artefacts/towing-rules/medium-sized-vehicle/no.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/medium-sized-vehicle/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you already have a driving licence with the C+E towing with a large vehicle entitlement on it?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Medium-sized vehicle (category C1)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=medium-sized-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a C1 medium-sized vehicle licence?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/medium-sized-vehicle?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you already have a C1 medium-sized vehicle licence?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle/no.txt b/test/artefacts/towing-rules/medium-sized-vehicle/no.txt
new file mode 100644
index 00000000000..09862160ed6
--- /dev/null
+++ b/test/artefacts/towing-rules/medium-sized-vehicle/no.txt
@@ -0,0 +1,14 @@
+Do you already have a driving licence with the C+E towing with a large vehicle entitlement on it?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle/no/no.html b/test/artefacts/towing-rules/medium-sized-vehicle/no/no.html
deleted file mode 100644
index f7da7055178..00000000000
--- a/test/artefacts/towing-rules/medium-sized-vehicle/no/no.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/medium-sized-vehicle/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When was your driving licence issued?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="before-jan-1997" />
-        Before 1 January 1997
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="from-jan-1997" />
-        From 1 January 1997
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Medium-sized vehicle (category C1)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=medium-sized-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a C1 medium-sized vehicle licence?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/medium-sized-vehicle?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you already have a C1 medium-sized vehicle licence?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a driving licence with the C+E towing with a large vehicle entitlement on it?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/medium-sized-vehicle/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you already have a driving licence with the C+E towing with a large vehicle entitlement on it?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle/no/no.txt b/test/artefacts/towing-rules/medium-sized-vehicle/no/no.txt
new file mode 100644
index 00000000000..2eb5b43bc27
--- /dev/null
+++ b/test/artefacts/towing-rules/medium-sized-vehicle/no/no.txt
@@ -0,0 +1,14 @@
+When was your driving licence issued?
+
+
+
+
+
+  * before-jan-1997: Before 1 January 1997
+  * from-jan-1997: From 1 January 1997
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle/no/no/from-jan-1997.html b/test/artefacts/towing-rules/medium-sized-vehicle/no/no/from-jan-1997.html
deleted file mode 100644
index 55cb833c526..00000000000
--- a/test/artefacts/towing-rules/medium-sized-vehicle/no/no/from-jan-1997.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/medium-sized-vehicle/no/no/from-jan-1997" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old are you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="under-18" />
-        Under 18
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="under-21" />
-        18 to 20
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="21-or-over" />
-        21 or over
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Medium-sized vehicle (category C1)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=medium-sized-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a C1 medium-sized vehicle licence?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/medium-sized-vehicle?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you already have a C1 medium-sized vehicle licence?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a driving licence with the C+E towing with a large vehicle entitlement on it?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/medium-sized-vehicle/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you already have a driving licence with the C+E towing with a large vehicle entitlement on it?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">When was your driving licence issued?</td>
-    <td class="previous-question-body">
-    From 1 January 1997</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/medium-sized-vehicle/no/no?previous_response=from-jan-1997">
-      Change<span class="visuallyhidden"> answer to "When was your driving licence issued?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle/no/no/from-jan-1997.txt b/test/artefacts/towing-rules/medium-sized-vehicle/no/no/from-jan-1997.txt
new file mode 100644
index 00000000000..9a9ae945d6c
--- /dev/null
+++ b/test/artefacts/towing-rules/medium-sized-vehicle/no/no/from-jan-1997.txt
@@ -0,0 +1,15 @@
+How old are you?
+
+
+
+
+
+  * under-18: Under 18
+  * under-21: 18 to 20
+  * 21-or-over: 21 or over
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle/yes.html b/test/artefacts/towing-rules/medium-sized-vehicle/yes.html
deleted file mode 100644
index f43370be9c2..00000000000
--- a/test/artefacts/towing-rules/medium-sized-vehicle/yes.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/medium-sized-vehicle/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old are you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="under-21" />
-        Under 21
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="21-or-over" />
-        21 or over
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Medium-sized vehicle (category C1)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=medium-sized-vehicle">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you already have a C1 medium-sized vehicle licence?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/medium-sized-vehicle?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you already have a C1 medium-sized vehicle licence?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/medium-sized-vehicle/yes.txt b/test/artefacts/towing-rules/medium-sized-vehicle/yes.txt
new file mode 100644
index 00000000000..5350ca126bf
--- /dev/null
+++ b/test/artefacts/towing-rules/medium-sized-vehicle/yes.txt
@@ -0,0 +1,14 @@
+How old are you?
+
+
+
+
+
+  * under-21: Under 21
+  * 21-or-over: 21 or over
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/minibus.html b/test/artefacts/towing-rules/minibus.html
deleted file mode 100644
index fd6f1afed17..00000000000
--- a/test/artefacts/towing-rules/minibus.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/minibus" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Did you pass your test before 1 January 1997?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Minibus (category D1)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=minibus">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/minibus.txt b/test/artefacts/towing-rules/minibus.txt
new file mode 100644
index 00000000000..c113344b5af
--- /dev/null
+++ b/test/artefacts/towing-rules/minibus.txt
@@ -0,0 +1,14 @@
+Did you pass your test before 1 January 1997?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/minibus/no.html b/test/artefacts/towing-rules/minibus/no.html
deleted file mode 100644
index 171d38fa98d..00000000000
--- a/test/artefacts/towing-rules/minibus/no.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/minibus/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you have a full category D+E towing with a bus licence?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Minibus (category D1)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=minibus">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you pass your test before 1 January 1997?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/minibus?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did you pass your test before 1 January 1997?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/minibus/no.txt b/test/artefacts/towing-rules/minibus/no.txt
new file mode 100644
index 00000000000..c7473d79ab5
--- /dev/null
+++ b/test/artefacts/towing-rules/minibus/no.txt
@@ -0,0 +1,14 @@
+Do you have a full category D+E towing with a bus licence?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/minibus/no/no.html b/test/artefacts/towing-rules/minibus/no/no.html
deleted file mode 100644
index 385def41b65..00000000000
--- a/test/artefacts/towing-rules/minibus/no/no.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/minibus/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you have a full category D1 minibus licence?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Minibus (category D1)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=minibus">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you pass your test before 1 January 1997?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/minibus?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did you pass your test before 1 January 1997?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have a full category D+E towing with a bus licence?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/minibus/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you have a full category D+E towing with a bus licence?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/minibus/no/no.txt b/test/artefacts/towing-rules/minibus/no/no.txt
new file mode 100644
index 00000000000..3b9f9df5275
--- /dev/null
+++ b/test/artefacts/towing-rules/minibus/no/no.txt
@@ -0,0 +1,14 @@
+Do you have a full category D1 minibus licence?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/minibus/no/no/no.html b/test/artefacts/towing-rules/minibus/no/no/no.html
deleted file mode 100644
index 2a28594799a..00000000000
--- a/test/artefacts/towing-rules/minibus/no/no/no.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y/minibus/no/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How old are you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="under-21" />
-        Under 21
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="21-or-over" />
-        21 or over
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/towing-rules">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">What kind of vehicle do you want to tow with?</td>
-    <td class="previous-question-body">
-    Minibus (category D1)</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y?previous_response=minibus">
-      Change<span class="visuallyhidden"> answer to "What kind of vehicle do you want to tow with?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Did you pass your test before 1 January 1997?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/minibus?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Did you pass your test before 1 January 1997?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have a full category D+E towing with a bus licence?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/minibus/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you have a full category D+E towing with a bus licence?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have a full category D1 minibus licence?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/towing-rules/y/minibus/no/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Do you have a full category D1 minibus licence?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/minibus/no/no/no.txt b/test/artefacts/towing-rules/minibus/no/no/no.txt
new file mode 100644
index 00000000000..5350ca126bf
--- /dev/null
+++ b/test/artefacts/towing-rules/minibus/no/no/no.txt
@@ -0,0 +1,14 @@
+How old are you?
+
+
+
+
+
+  * under-21: Under 21
+  * 21-or-over: 21 or over
+
+
+
+
+
+
diff --git a/test/artefacts/towing-rules/y.html b/test/artefacts/towing-rules/y.html
deleted file mode 100644
index a045cdd15f6..00000000000
--- a/test/artefacts/towing-rules/y.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>Towing: licence and age requirements - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        Towing: licence and age requirements
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/towing-rules/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    What kind of vehicle do you want to tow with?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="car-or-light-vehicle" />
-        Car (category B)
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="medium-sized-vehicle" />
-        Medium-sized vehicle (category C1)
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="large-vehicle" />
-        Large vehicle (category C)
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="minibus" />
-        Minibus (category D1)
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="bus" />
-        Bus (category D)
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/towing-rules/y.txt b/test/artefacts/towing-rules/y.txt
new file mode 100644
index 00000000000..e5e5bdb2afa
--- /dev/null
+++ b/test/artefacts/towing-rules/y.txt
@@ -0,0 +1,17 @@
+What kind of vehicle do you want to tow with?
+
+
+
+
+
+  * car-or-light-vehicle: Car (category B)
+  * medium-sized-vehicle: Medium-sized vehicle (category C1)
+  * large-vehicle: Large vehicle (category C)
+  * minibus: Minibus (category D1)
+  * bus: Bus (category D)
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad.html b/test/artefacts/uk-benefits-abroad/going_abroad.html
deleted file mode 100644
index 7e6e365b30e..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which benefit will you be claiming?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="jsa" />
-        Jobseeker's Allowance (JSA)
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="pension" />
-        State Pension
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="winter_fuel_payment" />
-        Winter Fuel Payment
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="maternity_benefits" />
-        Maternity benefits
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="child_benefit" />
-        Child Benefit
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="iidb" />
-        Industrial Injuries Disablement Benefit
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="ssp" />
-        Statutory Sick Pay (SSP)
-      </label>
-    </li>
-    <li>
-      <label for="response_7" class="selectable">
-        <input type="radio" name="response" id="response_7" value="esa" />
-        Employment and Support Allowance (ESA)
-      </label>
-    </li>
-    <li>
-      <label for="response_8" class="selectable">
-        <input type="radio" name="response" id="response_8" value="disability_benefits" />
-        Benefits for carers and people with disabilities 
-      </label>
-    </li>
-    <li>
-      <label for="response_9" class="selectable">
-        <input type="radio" name="response" id="response_9" value="bereavement_benefits" />
-        Bereavement benefits
-      </label>
-    </li>
-    <li>
-      <label for="response_10" class="selectable">
-        <input type="radio" name="response" id="response_10" value="tax_credits" />
-        Tax credits
-      </label>
-    </li>
-    <li>
-      <label for="response_11" class="selectable">
-        <input type="radio" name="response" id="response_11" value="income_support" />
-        Income Support
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad.txt b/test/artefacts/uk-benefits-abroad/going_abroad.txt
new file mode 100644
index 00000000000..5da9c55b890
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad.txt
@@ -0,0 +1,24 @@
+Which benefit will you be claiming?
+
+
+
+
+
+  * jsa: Jobseeker's Allowance (JSA)
+  * pension: State Pension
+  * winter_fuel_payment: Winter Fuel Payment
+  * maternity_benefits: Maternity benefits
+  * child_benefit: Child Benefit
+  * iidb: Industrial Injuries Disablement Benefit
+  * ssp: Statutory Sick Pay (SSP)
+  * esa: Employment and Support Allowance (ESA)
+  * disability_benefits: Benefits for carers and people with disabilities 
+  * bereavement_benefits: Bereavement benefits
+  * tax_credits: Tax credits
+  * income_support: Income Support
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.html b/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.html
deleted file mode 100644
index 0a18cb4d76d..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/child_benefit/austria" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Does the following apply to you?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>You&rsquo;re currently receiving at least one of the following UK benefits:</p>
-
-<ul>
-  <li>Bereavement benefits</li>
-  <li>Severe Disablement Allowance</li>
-  <li>Employment and Support Allowance</li>
-  <li>Incapacity Benefit</li>
-  <li>Industrial Injuries Disablement Benefit</li>
-  <li>State Pension</li>
-</ul>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Child Benefit</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=child_benefit">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which country are you moving to?</td>
-    <td class="previous-question-body">
-    Austria</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/child_benefit?previous_response=austria">
-      Change<span class="visuallyhidden"> answer to "Which country are you moving to?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.txt b/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.txt
new file mode 100644
index 00000000000..489a4d8354a
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.txt
@@ -0,0 +1,22 @@
+Does the following apply to you?
+
+You're currently receiving at least one of the following UK benefits:
+
+- Bereavement benefits
+- Severe Disablement Allowance
+- Employment and Support Allowance
+- Incapacity Benefit
+- Industrial Injuries Disablement Benefit
+- State Pension
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.html b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.html
deleted file mode 100644
index 94fbb909a51..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/disability_benefits" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How long will you be abroad for?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="temporary" />
-        Temporarily, eg for a holiday
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="permanent" />
-        Permanently
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Benefits for carers and people with disabilities </td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=disability_benefits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.txt b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.txt
new file mode 100644
index 00000000000..d0c14915eef
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.txt
@@ -0,0 +1,14 @@
+How long will you be abroad for?
+
+
+
+
+
+  * temporary: Temporarily, eg for a holiday
+  * permanent: Permanently
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.html b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.html
deleted file mode 100644
index d8d81482495..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/disability_benefits/permanent/austria" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you or a family member getting State Pension, Industrial Injuries Benefit, ESA (contributory) or bereavement benefits?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Benefits for carers and people with disabilities </td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=disability_benefits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long will you be abroad for?</td>
-    <td class="previous-question-body">
-    Permanently</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/disability_benefits?previous_response=permanent">
-      Change<span class="visuallyhidden"> answer to "How long will you be abroad for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which country are you moving to?</td>
-    <td class="previous-question-body">
-    Austria</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/disability_benefits/permanent?previous_response=austria">
-      Change<span class="visuallyhidden"> answer to "Which country are you moving to?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.txt b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.txt
new file mode 100644
index 00000000000..9880ed1f494
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.txt
@@ -0,0 +1,14 @@
+Are you or a family member getting State Pension, Industrial Injuries Benefit, ESA (contributory) or bereavement benefits?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/esa.html b/test/artefacts/uk-benefits-abroad/going_abroad/esa.html
deleted file mode 100644
index 1a21bc546e3..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/esa.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/esa" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How long are you going abroad for?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="esa_under_a_year_medical" />
-        Less than 1 year, to get medical treatment for yourself or your child
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="esa_under_a_year_other" />
-        Less than 1 year, for a different reason
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="esa_more_than_a_year" />
-        More than 1 year
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Employment and Support Allowance (ESA)</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=esa">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/esa.txt b/test/artefacts/uk-benefits-abroad/going_abroad/esa.txt
new file mode 100644
index 00000000000..2e1e3a87192
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/esa.txt
@@ -0,0 +1,15 @@
+How long are you going abroad for?
+
+
+
+
+
+  * esa_under_a_year_medical: Less than 1 year, to get medical treatment for yourself or your child
+  * esa_under_a_year_other: Less than 1 year, for a different reason
+  * esa_more_than_a_year: More than 1 year
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/iidb.html b/test/artefacts/uk-benefits-abroad/going_abroad/iidb.html
deleted file mode 100644
index 6f3a48bffe3..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/iidb.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/iidb" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you currently receiving Industrial Injuries Disablement Benefit?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Industrial Injuries Disablement Benefit</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=iidb">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/iidb.txt b/test/artefacts/uk-benefits-abroad/going_abroad/iidb.txt
new file mode 100644
index 00000000000..5ebee06b5fe
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/iidb.txt
@@ -0,0 +1,14 @@
+Are you currently receiving Industrial Injuries Disablement Benefit?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support.html
deleted file mode 100644
index 00209f8fa4d..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/income_support" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How long are you going abroad for?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">You can't apply for Income Support from abroad.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="is_under_a_year_medical" />
-        Less than 1 year, to get medical treatment for you or your child
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="is_under_a_year_other" />
-        Less than 1 year, for a different reason
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="is_more_than_a_year" />
-        More than 1 year
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Income Support</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=income_support">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support.txt b/test/artefacts/uk-benefits-abroad/going_abroad/income_support.txt
new file mode 100644
index 00000000000..d98f05e2970
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support.txt
@@ -0,0 +1,15 @@
+How long are you going abroad for?
+
+
+
+You can't apply for Income Support from abroad.
+
+  * is_under_a_year_medical: Less than 1 year, to get medical treatment for you or your child
+  * is_under_a_year_other: Less than 1 year, for a different reason
+  * is_more_than_a_year: More than 1 year
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.html
deleted file mode 100644
index bc67e2cafe1..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you travelling abroad with a partner who is getting Income Support with one of the following:
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li><a href="/income-support/what-youll-get">Pensioner premium</a></li>
-  <li><a href="/income-support/what-youll-get">Higher Pensioner premium</a></li>
-  <li><a href="/disability-premiums-income-support/eligibility">Disability premium</a></li>
-  <li><a href="/disability-premiums-income-support/eligibility">Severe Disability premium</a></li>
-</ul>
-
-
-      </article>
-
-      <p class="hint">Your partner must be getting the premium, not you.</p>
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Income Support</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=income_support">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long are you going abroad for?</td>
-    <td class="previous-question-body">
-    Less than 1 year, for a different reason</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support?previous_response=is_under_a_year_other">
-      Change<span class="visuallyhidden"> answer to "How long are you going abroad for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.txt b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.txt
new file mode 100644
index 00000000000..767a9e37aa3
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.txt
@@ -0,0 +1,18 @@
+Are you travelling abroad with a partner who is getting Income Support with one of the following:
+
+- [Pensioner premium](/income-support/what-youll-get)
+- [Higher Pensioner premium](/income-support/what-youll-get)
+- [Disability premium](/disability-premiums-income-support/eligibility)
+- [Severe Disability premium](/disability-premiums-income-support/eligibility)
+
+
+Your partner must be getting the premium, not you.
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.html
deleted file mode 100644
index 26dafc73482..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you getting Income Support while either:
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>getting <a href="/statutory-sick-pay/">Statutory Sick Pay</a></li>
-  <li>incapable of work, but being treated as capable of work because you are temporarily disqualified from receiving Income Support</li>
-</ul>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Income Support</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=income_support">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long are you going abroad for?</td>
-    <td class="previous-question-body">
-    Less than 1 year, for a different reason</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support?previous_response=is_under_a_year_other">
-      Change<span class="visuallyhidden"> answer to "How long are you going abroad for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you travelling abroad with a partner who is getting Income Support with one of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.txt b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.txt
new file mode 100644
index 00000000000..5c37b0875d1
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.txt
@@ -0,0 +1,16 @@
+Are you getting Income Support while either:
+
+- getting [Statutory Sick Pay](/statutory-sick-pay/)
+- incapable of work, but being treated as capable of work because you are temporarily disqualified from receiving Income Support
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.html
deleted file mode 100644
index 1d1b8e87ee8..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other/no/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you one of the following:
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>affected by a trades dispute (eg on strike)</li>
-  <li>age 16 to 19 and in full-time secondary education</li>
-  <li>appealing against a decision about your ability to work</li>
-</ul>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Income Support</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=income_support">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long are you going abroad for?</td>
-    <td class="previous-question-body">
-    Less than 1 year, for a different reason</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support?previous_response=is_under_a_year_other">
-      Change<span class="visuallyhidden"> answer to "How long are you going abroad for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you travelling abroad with a partner who is getting Income Support with one of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you getting Income Support while either:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other/no?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you getting Income Support while either:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.txt b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.txt
new file mode 100644
index 00000000000..1db7eb6449c
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.txt
@@ -0,0 +1,17 @@
+Are you one of the following:
+
+- affected by a trades dispute (eg on strike)
+- age 16 to 19 and in full-time secondary education
+- appealing against a decision about your ability to work
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.html
deleted file mode 100644
index d6ced9d343d..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other/no/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you going abroad to get medical treatment for the illness or disability that prevents you from working?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Income Support</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=income_support">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long are you going abroad for?</td>
-    <td class="previous-question-body">
-    Less than 1 year, for a different reason</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support?previous_response=is_under_a_year_other">
-      Change<span class="visuallyhidden"> answer to "How long are you going abroad for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you travelling abroad with a partner who is getting Income Support with one of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you getting Income Support while either:</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other/no?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you getting Income Support while either:"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.txt b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.txt
new file mode 100644
index 00000000000..73c3a987aa6
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.txt
@@ -0,0 +1,14 @@
+Are you going abroad to get medical treatment for the illness or disability that prevents you from working?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.html
deleted file mode 100644
index a5faaafa261..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other/no/yes/no" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Have you been unable to work or received Statutory Sick Pay for one of the following:
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>364 days</li>
-  <li>196 days if you&rsquo;re terminally ill, or getting the highest rate of Disability Living Allowance (care component) or the enhanced rate of Personal Independence Payment (daily living component)</li>
-</ul>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Income Support</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=income_support">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long are you going abroad for?</td>
-    <td class="previous-question-body">
-    Less than 1 year, for a different reason</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support?previous_response=is_under_a_year_other">
-      Change<span class="visuallyhidden"> answer to "How long are you going abroad for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you travelling abroad with a partner who is getting Income Support with one of the following:</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you getting Income Support while either:</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other/no?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Are you getting Income Support while either:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you going abroad to get medical treatment for the illness or disability that prevents you from working?</td>
-    <td class="previous-question-body">
-    No</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/income_support/is_under_a_year_other/no/yes?previous_response=no">
-      Change<span class="visuallyhidden"> answer to "Are you going abroad to get medical treatment for the illness or disability that prevents you from working?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.txt b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.txt
new file mode 100644
index 00000000000..f2aec9c7153
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.txt
@@ -0,0 +1,16 @@
+Have you been unable to work or received Statutory Sick Pay for one of the following:
+
+- 364 days
+- 196 days if you're terminally ill, or getting the highest rate of Disability Living Allowance (care component) or the enhanced rate of Personal Independence Payment (daily living component)
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/jsa.html b/test/artefacts/uk-benefits-abroad/going_abroad/jsa.html
deleted file mode 100644
index 17c57dfa972..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/jsa.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/jsa" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    If you're claiming JSA, how long are you going abroad for?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="less_than_a_year_medical" />
-        Less than 1 year, to get medical treatment for yourself or your child 
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="less_than_a_year_other" />
-        Less than 1 year, for a different reason
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="more_than_a_year" />
-        More than 1 year
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Jobseeker's Allowance (JSA)</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=jsa">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/jsa.txt b/test/artefacts/uk-benefits-abroad/going_abroad/jsa.txt
new file mode 100644
index 00000000000..e1bf9a035d9
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/jsa.txt
@@ -0,0 +1,16 @@
+If you're claiming JSA, how long are you going abroad for?
+
+*[JSA]: Jobseeker's Allowance
+
+
+
+
+  * less_than_a_year_medical: Less than 1 year, to get medical treatment for yourself or your child 
+  * less_than_a_year_other: Less than 1 year, for a different reason
+  * more_than_a_year: More than 1 year
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.html b/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.html
deleted file mode 100644
index 1daafd40d2a..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.html
+++ /dev/null
@@ -1,345 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/jsa/more_than_a_year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Which country are you moving to?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <select name="response" id="response"><option value="afghanistan">Afghanistan</option>
-<option value="albania">Albania</option>
-<option value="algeria">Algeria</option>
-<option value="american-samoa">American Samoa</option>
-<option value="andorra">Andorra</option>
-<option value="angola">Angola</option>
-<option value="anguilla">Anguilla</option>
-<option value="antigua-and-barbuda">Antigua And Barbuda</option>
-<option value="argentina">Argentina</option>
-<option value="armenia">Armenia</option>
-<option value="aruba">Aruba</option>
-<option value="australia">Australia</option>
-<option value="austria">Austria</option>
-<option value="azerbaijan">Azerbaijan</option>
-<option value="bahamas">Bahamas</option>
-<option value="bahrain">Bahrain</option>
-<option value="bangladesh">Bangladesh</option>
-<option value="barbados">Barbados</option>
-<option value="belarus">Belarus</option>
-<option value="belgium">Belgium</option>
-<option value="belize">Belize</option>
-<option value="benin">Benin</option>
-<option value="bermuda">Bermuda</option>
-<option value="bhutan">Bhutan</option>
-<option value="bolivia">Bolivia</option>
-<option value="bonaire-st-eustatius-saba">Bonaire St Eustatius Saba</option>
-<option value="bosnia-and-herzegovina">Bosnia And Herzegovina</option>
-<option value="botswana">Botswana</option>
-<option value="brazil">Brazil</option>
-<option value="british-indian-ocean-territory">British Indian Ocean Territory</option>
-<option value="british-virgin-islands">British Virgin Islands</option>
-<option value="brunei">Brunei</option>
-<option value="bulgaria">Bulgaria</option>
-<option value="burkina-faso">Burkina Faso</option>
-<option value="burma">Burma</option>
-<option value="burundi">Burundi</option>
-<option value="cambodia">Cambodia</option>
-<option value="cameroon">Cameroon</option>
-<option value="canada">Canada</option>
-<option value="cape-verde">Cape Verde</option>
-<option value="cayman-islands">Cayman Islands</option>
-<option value="central-african-republic">Central African Republic</option>
-<option value="chad">Chad</option>
-<option value="chile">Chile</option>
-<option value="china">China</option>
-<option value="colombia">Colombia</option>
-<option value="comoros">Comoros</option>
-<option value="congo">Congo</option>
-<option value="costa-rica">Costa Rica</option>
-<option value="cote-d-ivoire">Cote D Ivoire</option>
-<option value="croatia">Croatia</option>
-<option value="cuba">Cuba</option>
-<option value="curacao">Curacao</option>
-<option value="cyprus">Cyprus</option>
-<option value="czech-republic">Czech Republic</option>
-<option value="democratic-republic-of-congo">Democratic Republic Of Congo</option>
-<option value="denmark">Denmark</option>
-<option value="djibouti">Djibouti</option>
-<option value="dominica">Dominica</option>
-<option value="dominican-republic">Dominican Republic</option>
-<option value="ecuador">Ecuador</option>
-<option value="egypt">Egypt</option>
-<option value="el-salvador">El Salvador</option>
-<option value="equatorial-guinea">Equatorial Guinea</option>
-<option value="eritrea">Eritrea</option>
-<option value="estonia">Estonia</option>
-<option value="ethiopia">Ethiopia</option>
-<option value="falkland-islands">Falkland Islands</option>
-<option value="fiji">Fiji</option>
-<option value="finland">Finland</option>
-<option value="france">France</option>
-<option value="french-polynesia">French Polynesia</option>
-<option value="gabon">Gabon</option>
-<option value="gambia">Gambia</option>
-<option value="georgia">Georgia</option>
-<option value="germany">Germany</option>
-<option value="ghana">Ghana</option>
-<option value="gibraltar">Gibraltar</option>
-<option value="greece">Greece</option>
-<option value="grenada">Grenada</option>
-<option value="guatemala">Guatemala</option>
-<option value="guernsey">Guernsey</option>
-<option value="guinea">Guinea</option>
-<option value="guinea-bissau">Guinea Bissau</option>
-<option value="guyana">Guyana</option>
-<option value="haiti">Haiti</option>
-<option value="honduras">Honduras</option>
-<option value="hong-kong">Hong Kong</option>
-<option value="hungary">Hungary</option>
-<option value="iceland">Iceland</option>
-<option value="india">India</option>
-<option value="indonesia">Indonesia</option>
-<option value="iran">Iran</option>
-<option value="iraq">Iraq</option>
-<option value="ireland">Ireland</option>
-<option value="israel">Israel</option>
-<option value="italy">Italy</option>
-<option value="jamaica">Jamaica</option>
-<option value="japan">Japan</option>
-<option value="jersey">Jersey</option>
-<option value="jordan">Jordan</option>
-<option value="kazakhstan">Kazakhstan</option>
-<option value="kenya">Kenya</option>
-<option value="kiribati">Kiribati</option>
-<option value="kosovo">Kosovo</option>
-<option value="kuwait">Kuwait</option>
-<option value="kyrgyzstan">Kyrgyzstan</option>
-<option value="laos">Laos</option>
-<option value="latvia">Latvia</option>
-<option value="lebanon">Lebanon</option>
-<option value="lesotho">Lesotho</option>
-<option value="liberia">Liberia</option>
-<option value="libya">Libya</option>
-<option value="liechtenstein">Liechtenstein</option>
-<option value="lithuania">Lithuania</option>
-<option value="luxembourg">Luxembourg</option>
-<option value="macao">Macao</option>
-<option value="macedonia">Macedonia</option>
-<option value="madagascar">Madagascar</option>
-<option value="malawi">Malawi</option>
-<option value="malaysia">Malaysia</option>
-<option value="maldives">Maldives</option>
-<option value="mali">Mali</option>
-<option value="malta">Malta</option>
-<option value="marshall-islands">Marshall Islands</option>
-<option value="mauritania">Mauritania</option>
-<option value="mauritius">Mauritius</option>
-<option value="mexico">Mexico</option>
-<option value="micronesia">Micronesia</option>
-<option value="moldova">Moldova</option>
-<option value="monaco">Monaco</option>
-<option value="mongolia">Mongolia</option>
-<option value="montenegro">Montenegro</option>
-<option value="montserrat">Montserrat</option>
-<option value="morocco">Morocco</option>
-<option value="mozambique">Mozambique</option>
-<option value="namibia">Namibia</option>
-<option value="nauru">Nauru</option>
-<option value="nepal">Nepal</option>
-<option value="netherlands">Netherlands</option>
-<option value="new-caledonia">New Caledonia</option>
-<option value="new-zealand">New Zealand</option>
-<option value="nicaragua">Nicaragua</option>
-<option value="niger">Niger</option>
-<option value="nigeria">Nigeria</option>
-<option value="north-korea">North Korea</option>
-<option value="norway">Norway</option>
-<option value="oman">Oman</option>
-<option value="pakistan">Pakistan</option>
-<option value="palau">Palau</option>
-<option value="panama">Panama</option>
-<option value="papua-new-guinea">Papua New Guinea</option>
-<option value="paraguay">Paraguay</option>
-<option value="peru">Peru</option>
-<option value="philippines">Philippines</option>
-<option value="pitcairn-island">Pitcairn Island</option>
-<option value="poland">Poland</option>
-<option value="portugal">Portugal</option>
-<option value="qatar">Qatar</option>
-<option value="romania">Romania</option>
-<option value="russia">Russia</option>
-<option value="rwanda">Rwanda</option>
-<option value="saint-barthelemy">Saint Barthelemy</option>
-<option value="samoa">Samoa</option>
-<option value="san-marino">San Marino</option>
-<option value="sao-tome-and-principe">Sao Tome And Principe</option>
-<option value="saudi-arabia">Saudi Arabia</option>
-<option value="senegal">Senegal</option>
-<option value="serbia">Serbia</option>
-<option value="seychelles">Seychelles</option>
-<option value="sierra-leone">Sierra Leone</option>
-<option value="singapore">Singapore</option>
-<option value="slovakia">Slovakia</option>
-<option value="slovenia">Slovenia</option>
-<option value="solomon-islands">Solomon Islands</option>
-<option value="somalia">Somalia</option>
-<option value="south-africa">South Africa</option>
-<option value="south-georgia-and-south-sandwich-islands">South Georgia And South Sandwich Islands</option>
-<option value="south-korea">South Korea</option>
-<option value="south-sudan">South Sudan</option>
-<option value="spain">Spain</option>
-<option value="sri-lanka">Sri Lanka</option>
-<option value="st-helena-ascension-and-tristan-da-cunha">St Helena Ascension And Tristan Da Cunha</option>
-<option value="st-kitts-and-nevis">St Kitts And Nevis</option>
-<option value="st-lucia">St Lucia</option>
-<option value="st-martin">St Martin</option>
-<option value="st-pierre-and-miquelon">St Pierre And Miquelon</option>
-<option value="st-vincent-and-the-grenadines">St Vincent And The Grenadines</option>
-<option value="sudan">Sudan</option>
-<option value="suriname">Suriname</option>
-<option value="swaziland">Swaziland</option>
-<option value="sweden">Sweden</option>
-<option value="switzerland">Switzerland</option>
-<option value="syria">Syria</option>
-<option value="taiwan">Taiwan</option>
-<option value="tajikistan">Tajikistan</option>
-<option value="tanzania">Tanzania</option>
-<option value="thailand">Thailand</option>
-<option value="the-occupied-palestinian-territories">The Occupied Palestinian Territories</option>
-<option value="timor-leste">Timor Leste</option>
-<option value="togo">Togo</option>
-<option value="tonga">Tonga</option>
-<option value="trinidad-and-tobago">Trinidad And Tobago</option>
-<option value="tunisia">Tunisia</option>
-<option value="turkey">Turkey</option>
-<option value="turkmenistan">Turkmenistan</option>
-<option value="turks-and-caicos-islands">Turks And Caicos Islands</option>
-<option value="tuvalu">Tuvalu</option>
-<option value="uganda">Uganda</option>
-<option value="ukraine">Ukraine</option>
-<option value="united-arab-emirates">United Arab Emirates</option>
-<option value="uruguay">Uruguay</option>
-<option value="usa">Usa</option>
-<option value="uzbekistan">Uzbekistan</option>
-<option value="vanuatu">Vanuatu</option>
-<option value="venezuela">Venezuela</option>
-<option value="vietnam">Vietnam</option>
-<option value="wallis-and-futuna">Wallis And Futuna</option>
-<option value="western-sahara">Western Sahara</option>
-<option value="yemen">Yemen</option>
-<option value="zambia">Zambia</option>
-<option value="zimbabwe">Zimbabwe</option></select>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Jobseeker's Allowance (JSA)</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=jsa">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">If you're claiming JSA, how long are you going abroad for?</td>
-    <td class="previous-question-body">
-    More than 1 year</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/jsa?previous_response=more_than_a_year">
-      Change<span class="visuallyhidden"> answer to "If you're claiming JSA, how long are you going abroad for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.txt b/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.txt
new file mode 100644
index 00000000000..6c2fb810b2d
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.txt
@@ -0,0 +1,234 @@
+Which country are you moving to?
+
+
+
+
+
+  * afghanistan: Afghanistan
+  * albania: Albania
+  * algeria: Algeria
+  * american-samoa: American Samoa
+  * andorra: Andorra
+  * angola: Angola
+  * anguilla: Anguilla
+  * antigua-and-barbuda: Antigua And Barbuda
+  * argentina: Argentina
+  * armenia: Armenia
+  * aruba: Aruba
+  * australia: Australia
+  * austria: Austria
+  * azerbaijan: Azerbaijan
+  * bahamas: Bahamas
+  * bahrain: Bahrain
+  * bangladesh: Bangladesh
+  * barbados: Barbados
+  * belarus: Belarus
+  * belgium: Belgium
+  * belize: Belize
+  * benin: Benin
+  * bermuda: Bermuda
+  * bhutan: Bhutan
+  * bolivia: Bolivia
+  * bonaire-st-eustatius-saba: Bonaire St Eustatius Saba
+  * bosnia-and-herzegovina: Bosnia And Herzegovina
+  * botswana: Botswana
+  * brazil: Brazil
+  * british-indian-ocean-territory: British Indian Ocean Territory
+  * british-virgin-islands: British Virgin Islands
+  * brunei: Brunei
+  * bulgaria: Bulgaria
+  * burkina-faso: Burkina Faso
+  * burma: Burma
+  * burundi: Burundi
+  * cambodia: Cambodia
+  * cameroon: Cameroon
+  * canada: Canada
+  * cape-verde: Cape Verde
+  * cayman-islands: Cayman Islands
+  * central-african-republic: Central African Republic
+  * chad: Chad
+  * chile: Chile
+  * china: China
+  * colombia: Colombia
+  * comoros: Comoros
+  * congo: Congo
+  * costa-rica: Costa Rica
+  * cote-d-ivoire: Cote D Ivoire
+  * croatia: Croatia
+  * cuba: Cuba
+  * curacao: Curacao
+  * cyprus: Cyprus
+  * czech-republic: Czech Republic
+  * democratic-republic-of-congo: Democratic Republic Of Congo
+  * denmark: Denmark
+  * djibouti: Djibouti
+  * dominica: Dominica
+  * dominican-republic: Dominican Republic
+  * ecuador: Ecuador
+  * egypt: Egypt
+  * el-salvador: El Salvador
+  * equatorial-guinea: Equatorial Guinea
+  * eritrea: Eritrea
+  * estonia: Estonia
+  * ethiopia: Ethiopia
+  * falkland-islands: Falkland Islands
+  * fiji: Fiji
+  * finland: Finland
+  * france: France
+  * french-polynesia: French Polynesia
+  * gabon: Gabon
+  * gambia: Gambia
+  * georgia: Georgia
+  * germany: Germany
+  * ghana: Ghana
+  * gibraltar: Gibraltar
+  * greece: Greece
+  * grenada: Grenada
+  * guatemala: Guatemala
+  * guernsey: Guernsey
+  * guinea: Guinea
+  * guinea-bissau: Guinea Bissau
+  * guyana: Guyana
+  * haiti: Haiti
+  * honduras: Honduras
+  * hong-kong: Hong Kong
+  * hungary: Hungary
+  * iceland: Iceland
+  * india: India
+  * indonesia: Indonesia
+  * iran: Iran
+  * iraq: Iraq
+  * ireland: Ireland
+  * israel: Israel
+  * italy: Italy
+  * jamaica: Jamaica
+  * japan: Japan
+  * jersey: Jersey
+  * jordan: Jordan
+  * kazakhstan: Kazakhstan
+  * kenya: Kenya
+  * kiribati: Kiribati
+  * kosovo: Kosovo
+  * kuwait: Kuwait
+  * kyrgyzstan: Kyrgyzstan
+  * laos: Laos
+  * latvia: Latvia
+  * lebanon: Lebanon
+  * lesotho: Lesotho
+  * liberia: Liberia
+  * libya: Libya
+  * liechtenstein: Liechtenstein
+  * lithuania: Lithuania
+  * luxembourg: Luxembourg
+  * macao: Macao
+  * macedonia: Macedonia
+  * madagascar: Madagascar
+  * malawi: Malawi
+  * malaysia: Malaysia
+  * maldives: Maldives
+  * mali: Mali
+  * malta: Malta
+  * marshall-islands: Marshall Islands
+  * mauritania: Mauritania
+  * mauritius: Mauritius
+  * mexico: Mexico
+  * micronesia: Micronesia
+  * moldova: Moldova
+  * monaco: Monaco
+  * mongolia: Mongolia
+  * montenegro: Montenegro
+  * montserrat: Montserrat
+  * morocco: Morocco
+  * mozambique: Mozambique
+  * namibia: Namibia
+  * nauru: Nauru
+  * nepal: Nepal
+  * netherlands: Netherlands
+  * new-caledonia: New Caledonia
+  * new-zealand: New Zealand
+  * nicaragua: Nicaragua
+  * niger: Niger
+  * nigeria: Nigeria
+  * north-korea: North Korea
+  * norway: Norway
+  * oman: Oman
+  * pakistan: Pakistan
+  * palau: Palau
+  * panama: Panama
+  * papua-new-guinea: Papua New Guinea
+  * paraguay: Paraguay
+  * peru: Peru
+  * philippines: Philippines
+  * pitcairn-island: Pitcairn Island
+  * poland: Poland
+  * portugal: Portugal
+  * qatar: Qatar
+  * romania: Romania
+  * russia: Russia
+  * rwanda: Rwanda
+  * saint-barthelemy: Saint Barthelemy
+  * samoa: Samoa
+  * san-marino: San Marino
+  * sao-tome-and-principe: Sao Tome And Principe
+  * saudi-arabia: Saudi Arabia
+  * senegal: Senegal
+  * serbia: Serbia
+  * seychelles: Seychelles
+  * sierra-leone: Sierra Leone
+  * singapore: Singapore
+  * slovakia: Slovakia
+  * slovenia: Slovenia
+  * solomon-islands: Solomon Islands
+  * somalia: Somalia
+  * south-africa: South Africa
+  * south-georgia-and-south-sandwich-islands: South Georgia And South Sandwich Islands
+  * south-korea: South Korea
+  * south-sudan: South Sudan
+  * spain: Spain
+  * sri-lanka: Sri Lanka
+  * st-helena-ascension-and-tristan-da-cunha: St Helena Ascension And Tristan Da Cunha
+  * st-kitts-and-nevis: St Kitts And Nevis
+  * st-lucia: St Lucia
+  * st-martin: St Martin
+  * st-pierre-and-miquelon: St Pierre And Miquelon
+  * st-vincent-and-the-grenadines: St Vincent And The Grenadines
+  * sudan: Sudan
+  * suriname: Suriname
+  * swaziland: Swaziland
+  * sweden: Sweden
+  * switzerland: Switzerland
+  * syria: Syria
+  * taiwan: Taiwan
+  * tajikistan: Tajikistan
+  * tanzania: Tanzania
+  * thailand: Thailand
+  * the-occupied-palestinian-territories: The Occupied Palestinian Territories
+  * timor-leste: Timor Leste
+  * togo: Togo
+  * tonga: Tonga
+  * trinidad-and-tobago: Trinidad And Tobago
+  * tunisia: Tunisia
+  * turkey: Turkey
+  * turkmenistan: Turkmenistan
+  * turks-and-caicos-islands: Turks And Caicos Islands
+  * tuvalu: Tuvalu
+  * uganda: Uganda
+  * ukraine: Ukraine
+  * united-arab-emirates: United Arab Emirates
+  * uruguay: Uruguay
+  * usa: Usa
+  * uzbekistan: Uzbekistan
+  * vanuatu: Vanuatu
+  * venezuela: Venezuela
+  * vietnam: Vietnam
+  * wallis-and-futuna: Wallis And Futuna
+  * western-sahara: Western Sahara
+  * yemen: Yemen
+  * zambia: Zambia
+  * zimbabwe: Zimbabwe
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan.html b/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan.html
deleted file mode 100644
index 4b9efe62960..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/maternity_benefits/afghanistan" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Is your employer paying National Insurance contributions for you?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Maternity benefits</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=maternity_benefits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which country are you moving to?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/maternity_benefits?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country are you moving to?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan.txt b/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan.txt
new file mode 100644
index 00000000000..2e702ee0a2a
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan.txt
@@ -0,0 +1,14 @@
+Is your employer paying National Insurance contributions for you?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan/yes.html b/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan/yes.html
deleted file mode 100644
index 48f55e99882..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan/yes.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/maternity_benefits/afghanistan/yes" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you eligible for Statutory Maternity Pay?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>If you&rsquo;re unsure you can read our <a href="/statutory-maternity-pay#eligibility">Maternity pay and leave guide</a></p>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Maternity benefits</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=maternity_benefits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which country are you moving to?</td>
-    <td class="previous-question-body">
-    Afghanistan</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/maternity_benefits?previous_response=afghanistan">
-      Change<span class="visuallyhidden"> answer to "Which country are you moving to?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Is your employer paying National Insurance contributions for you?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/maternity_benefits/afghanistan?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Is your employer paying National Insurance contributions for you?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan/yes.txt b/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan/yes.txt
new file mode 100644
index 00000000000..e8d6ad18f6c
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/afghanistan/yes.txt
@@ -0,0 +1,15 @@
+Are you eligible for Statutory Maternity Pay?
+
+If you're unsure you can read our [Maternity pay and leave guide](/statutory-maternity-pay#eligibility)
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/austria.html b/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/austria.html
deleted file mode 100644
index f529991b3a8..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/austria.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/maternity_benefits/austria" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you working for a UK employer and paying Class 1 National Insurance Contributions?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <p>If you&rsquo;re unsure you can read our <a href="/national-insurance/how-much-national-insurance-you-pay">National Insurance Guide</a>.</p>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Maternity benefits</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=maternity_benefits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which country are you moving to?</td>
-    <td class="previous-question-body">
-    Austria</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/maternity_benefits?previous_response=austria">
-      Change<span class="visuallyhidden"> answer to "Which country are you moving to?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/austria.txt b/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/austria.txt
new file mode 100644
index 00000000000..29f8ddb24a8
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/maternity_benefits/austria.txt
@@ -0,0 +1,15 @@
+Are you working for a UK employer and paying Class 1 National Insurance Contributions?
+
+If you're unsure you can read our [National Insurance Guide](/national-insurance/how-much-national-insurance-you-pay).
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/ssp/austria.html b/test/artefacts/uk-benefits-abroad/going_abroad/ssp/austria.html
deleted file mode 100644
index 0d9892cc556..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/ssp/austria.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/ssp/austria" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you working for a UK employer?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Statutory Sick Pay (SSP)</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=ssp">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which country are you moving to?</td>
-    <td class="previous-question-body">
-    Austria</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/ssp?previous_response=austria">
-      Change<span class="visuallyhidden"> answer to "Which country are you moving to?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/ssp/austria.txt b/test/artefacts/uk-benefits-abroad/going_abroad/ssp/austria.txt
new file mode 100644
index 00000000000..aef7f7a2d4a
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/ssp/austria.txt
@@ -0,0 +1,14 @@
+Are you working for a UK employer?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits.html b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits.html
deleted file mode 100644
index c72d8432d92..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/tax_credits" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you or your partner one of the following?
-  </h2>
-  <div class="question-body">
-
-      <p class="hint">A Crown servant is someone who works for the UK government. A cross-border worker is someone who regularly travels to or from another country to work.</p>
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="crown_servant" />
-        A Crown servant
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="cross_border_worker" />
-        A cross-border worker
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="none_of_the_above" />
-        None of the above
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Tax credits</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=tax_credits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits.txt b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits.txt
new file mode 100644
index 00000000000..eb7b629fa9a
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits.txt
@@ -0,0 +1,15 @@
+Are you or your partner one of the following?
+
+
+
+A Crown servant is someone who works for the UK government. A cross-border worker is someone who regularly travels to or from another country to work.
+
+  * crown_servant: A Crown servant
+  * cross_border_worker: A cross-border worker
+  * none_of_the_above: None of the above
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above.html b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above.html
deleted file mode 100644
index c86b5023324..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/tax_credits/none_of_the_above" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How long are you going abroad for?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="tax_credits_up_to_a_year" />
-        Up to 1 year
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="tax_credits_more_than_a_year" />
-        More than 1 year or permanently
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Tax credits</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=tax_credits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you or your partner one of the following?</td>
-    <td class="previous-question-body">
-    None of the above</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/tax_credits?previous_response=none_of_the_above">
-      Change<span class="visuallyhidden"> answer to "Are you or your partner one of the following?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above.txt b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above.txt
new file mode 100644
index 00000000000..8897e40d3cc
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above.txt
@@ -0,0 +1,14 @@
+How long are you going abroad for?
+
+
+
+
+
+  * tax_credits_up_to_a_year: Up to 1 year
+  * tax_credits_more_than_a_year: More than 1 year or permanently
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year.html b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year.html
deleted file mode 100644
index 26a93ca64d3..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Do you have any children?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Tax credits</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=tax_credits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you or your partner one of the following?</td>
-    <td class="previous-question-body">
-    None of the above</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/tax_credits?previous_response=none_of_the_above">
-      Change<span class="visuallyhidden"> answer to "Are you or your partner one of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long are you going abroad for?</td>
-    <td class="previous-question-body">
-    More than 1 year or permanently</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/tax_credits/none_of_the_above?previous_response=tax_credits_more_than_a_year">
-      Change<span class="visuallyhidden"> answer to "How long are you going abroad for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year.txt b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year.txt
new file mode 100644
index 00000000000..d36397e40fc
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year.txt
@@ -0,0 +1,14 @@
+Do you have any children?
+
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year/yes/austria.html b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year/yes/austria.html
deleted file mode 100644
index 9561914cdc9..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year/yes/austria.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year/yes/austria" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you currently claiming State Pension or any of the following benefits?
-  </h2>
-  <div class="question-body">
-      <article role="article">
-        <ul>
-  <li>Incapacity Benefit</li>
-  <li>Widow&rsquo;s Benefit</li>
-  <li>Bereavement Benefit</li>
-  <li>Industrial Injuries Disablement Benefit</li>
-  <li>contribution-based Employment and Support Allowance</li>
-  <li>Severe Disablement Allowance</li>
-</ul>
-
-
-      </article>
-
-
-    <div class="">
-
-      <ul class="options inline">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="yes" />
-        Yes
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="no" />
-        No
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Tax credits</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=tax_credits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you or your partner one of the following?</td>
-    <td class="previous-question-body">
-    None of the above</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/tax_credits?previous_response=none_of_the_above">
-      Change<span class="visuallyhidden"> answer to "Are you or your partner one of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long are you going abroad for?</td>
-    <td class="previous-question-body">
-    More than 1 year or permanently</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/tax_credits/none_of_the_above?previous_response=tax_credits_more_than_a_year">
-      Change<span class="visuallyhidden"> answer to "How long are you going abroad for?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Do you have any children?</td>
-    <td class="previous-question-body">
-    Yes</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year?previous_response=yes">
-      Change<span class="visuallyhidden"> answer to "Do you have any children?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which country are you moving to?</td>
-    <td class="previous-question-body">
-    Austria</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year/yes?previous_response=austria">
-      Change<span class="visuallyhidden"> answer to "Which country are you moving to?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year/yes/austria.txt b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year/yes/austria.txt
new file mode 100644
index 00000000000..8e646a8add6
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_more_than_a_year/yes/austria.txt
@@ -0,0 +1,20 @@
+Are you currently claiming State Pension or any of the following benefits?
+
+- Incapacity Benefit
+- Widow's Benefit
+- Bereavement Benefit
+- Industrial Injuries Disablement Benefit
+- contribution-based Employment and Support Allowance
+- Severe Disablement Allowance
+
+
+
+
+  * yes: Yes
+  * no: No
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_up_to_a_year.html b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_up_to_a_year.html
deleted file mode 100644
index 208802d01e7..00000000000
--- a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_up_to_a_year.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y/going_abroad/tax_credits/none_of_the_above/tax_credits_up_to_a_year" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Why are you going abroad?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="tax_credits_holiday" />
-        A holiday or business trip
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="tax_credits_medical_treatment" />
-        For medical treatment for yourself, your partner or your child
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="tax_credits_death" />
-        Because of the death of your partner, child or close family member
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/uk-benefits-abroad">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">Are you currently:</td>
-    <td class="previous-question-body">
-    in the UK and planning to move abroad</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y?previous_response=going_abroad">
-      Change<span class="visuallyhidden"> answer to "Are you currently:"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Which benefit will you be claiming?</td>
-    <td class="previous-question-body">
-    Tax credits</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad?previous_response=tax_credits">
-      Change<span class="visuallyhidden"> answer to "Which benefit will you be claiming?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">Are you or your partner one of the following?</td>
-    <td class="previous-question-body">
-    None of the above</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/tax_credits?previous_response=none_of_the_above">
-      Change<span class="visuallyhidden"> answer to "Are you or your partner one of the following?"</span>
-</a>  </td>
-</tr>
-
-              <tr class="section">
-  <td class="previous-question-title">How long are you going abroad for?</td>
-    <td class="previous-question-body">
-    Up to 1 year</td>
-
-  <td class="link-right">
-    <a href="/uk-benefits-abroad/y/going_abroad/tax_credits/none_of_the_above?previous_response=tax_credits_up_to_a_year">
-      Change<span class="visuallyhidden"> answer to "How long are you going abroad for?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_up_to_a_year.txt b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_up_to_a_year.txt
new file mode 100644
index 00000000000..774e4751031
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/going_abroad/tax_credits/none_of_the_above/tax_credits_up_to_a_year.txt
@@ -0,0 +1,15 @@
+Why are you going abroad?
+
+
+
+
+
+  * tax_credits_holiday: A holiday or business trip
+  * tax_credits_medical_treatment: For medical treatment for yourself, your partner or your child
+  * tax_credits_death: Because of the death of your partner, child or close family member
+
+
+
+
+
+
diff --git a/test/artefacts/uk-benefits-abroad/y.html b/test/artefacts/uk-benefits-abroad/y.html
deleted file mode 100644
index 382df4873f2..00000000000
--- a/test/artefacts/uk-benefits-abroad/y.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>UK benefits if you're going or living abroad - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        UK benefits if you're going or living abroad
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/uk-benefits-abroad/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    Are you currently:
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="going_abroad" />
-        in the UK and planning to move abroad
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="already_abroad" />
-        someone who has lived and worked in the UK who is now living abroad
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/uk-benefits-abroad/y.txt b/test/artefacts/uk-benefits-abroad/y.txt
new file mode 100644
index 00000000000..d6ec94b7b98
--- /dev/null
+++ b/test/artefacts/uk-benefits-abroad/y.txt
@@ -0,0 +1,14 @@
+Are you currently:
+
+
+
+
+
+  * going_abroad: in the UK and planning to move abroad
+  * already_abroad: someone who has lived and worked in the UK who is now living abroad
+
+
+
+
+
+
diff --git a/test/artefacts/vat-payment-deadlines/2015-01-31.html b/test/artefacts/vat-payment-deadlines/2015-01-31.html
deleted file mode 100644
index 0da0fa57b28..00000000000
--- a/test/artefacts/vat-payment-deadlines/2015-01-31.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>VAT payment deadline calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        VAT payment deadline calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/vat-payment-deadlines/y/2015-01-31" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    How do you want to pay?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <ul class="options">
-    <li>
-      <label for="response_0" class="selectable">
-        <input type="radio" name="response" id="response_0" value="direct-debit" />
-        Direct debit
-      </label>
-    </li>
-    <li>
-      <label for="response_1" class="selectable">
-        <input type="radio" name="response" id="response_1" value="online-telephone-banking" />
-        Online or telephone banking (Faster Payments)
-      </label>
-    </li>
-    <li>
-      <label for="response_2" class="selectable">
-        <input type="radio" name="response" id="response_2" value="online-debit-credit-card" />
-        Online debit or credit card (BillPay)
-      </label>
-    </li>
-    <li>
-      <label for="response_3" class="selectable">
-        <input type="radio" name="response" id="response_3" value="bacs-direct-credit" />
-        Bacs direct credit
-      </label>
-    </li>
-    <li>
-      <label for="response_4" class="selectable">
-        <input type="radio" name="response" id="response_4" value="bank-giro" />
-        Bank Giro
-      </label>
-    </li>
-    <li>
-      <label for="response_5" class="selectable">
-        <input type="radio" name="response" id="response_5" value="chaps" />
-        CHAPS
-      </label>
-    </li>
-    <li>
-      <label for="response_6" class="selectable">
-        <input type="radio" name="response" id="response_6" value="cheque" />
-        Cheque
-      </label>
-    </li>
-</ul>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-    <div class="previous-answers">
-    <div class="done-questions">
-      <article>
-          <h3 class="previous-answers-title">
-            Previous answers
-          </h3>
-          <a class="start-right" href="/vat-payment-deadlines">Start again</a>
-        <table>
-          <tbody>
-              <tr class="section">
-  <td class="previous-question-title">When does your VAT accounting period end?</td>
-    <td class="previous-question-body">
-    31 January 2015</td>
-
-  <td class="link-right">
-    <a href="/vat-payment-deadlines/y?previous_response=2015-01-31">
-      Change<span class="visuallyhidden"> answer to "When does your VAT accounting period end?"</span>
-</a>  </td>
-</tr>
-
-          </tbody>
-        </table>
-      </article>
-    </div>
-  </div>
-
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/vat-payment-deadlines/2015-01-31.txt b/test/artefacts/vat-payment-deadlines/2015-01-31.txt
new file mode 100644
index 00000000000..bc7f14e7e1d
--- /dev/null
+++ b/test/artefacts/vat-payment-deadlines/2015-01-31.txt
@@ -0,0 +1,19 @@
+How do you want to pay?
+
+
+
+
+
+  * direct-debit: Direct debit
+  * online-telephone-banking: Online or telephone banking (Faster Payments)
+  * online-debit-credit-card: Online debit or credit card (BillPay)
+  * bacs-direct-credit: Bacs direct credit
+  * bank-giro: Bank Giro
+  * chaps: CHAPS
+  * cheque: Cheque
+
+
+
+
+
+
diff --git a/test/artefacts/vat-payment-deadlines/y.html b/test/artefacts/vat-payment-deadlines/y.html
deleted file mode 100644
index 500ee5ac093..00000000000
--- a/test/artefacts/vat-payment-deadlines/y.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/smartanswers/application.css" />
-    <link rel="stylesheet" media="print" href="/smartanswers/print.css" />
-    <title>VAT payment deadline calculator - GOV.UK</title>
-    <script src="/smartanswers/smart-answers.js" defer="defer"></script>
-    <meta name="robots" content="noindex">
-
-  </head>
-<body class="mainstream">
-
-  
-
-  <div id="wrapper" class="answer smart_answer">
-    
-
-<main id="content" role="main">
-  <div id="js-replaceable"  class="smart-answer-questions group">
-      
-
-  <header class="page-header group">
-    <div>
-      <h1>
-        VAT payment deadline calculator
-      </h1>
-    </div>
-  </header>
-
-    <div class="step current">
-      <form action="/vat-payment-deadlines/y" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
-        <div class="current-question" id="current-question">
-          <div class="question">
-  <h2>
-    When does your VAT accounting period end?
-  </h2>
-  <div class="question-body">
-
-
-    <div class="">
-
-      <fieldset>
-    <label for="response_month">Month
-      <select id="response_month" name="response[month]">
-<option value=""></option>
-<option value="1">January</option>
-<option value="2">February</option>
-<option value="3">March</option>
-<option value="4">April</option>
-<option value="5">May</option>
-<option value="6">June</option>
-<option value="7">July</option>
-<option value="8">August</option>
-<option value="9">September</option>
-<option value="10">October</option>
-<option value="11">November</option>
-<option value="12">December</option>
-</select>
-
-    </label>
-    <label for="response_year">Year
-      <select id="response_year" name="response[year]">
-<option value=""></option>
-<option value="2014">2014</option>
-<option value="2015">2015</option>
-<option value="2016">2016</option>
-<option value="2017">2017</option>
-<option value="2018">2018</option>
-</select>
-
-    </label>
-</fieldset>
-
-
-      
-
-    </div>
-  </div>
-</div>
-
-          <div class="next-question">
-            <input type="hidden" name="next" value="1" />
-            <button type="submit" class="medium button">Next step</button>
-          </div>
-        </div>
-      </form>
-    </div>
-  
-
-  </div>
-
-  <div class="meta-wrapper">
-    <div id="report-a-problem"></div>
-    <div class="meta-data group">
-  <div class="inner">
-    <div class="print-and-modified-date group">
-      <p class="modified-date">Last updated:  1 January 2015</p>
-    </div>
-  </div>
-</div>
-
-  </div>
-</main>
-
-  </div>
-</body>
-</html>
diff --git a/test/artefacts/vat-payment-deadlines/y.txt b/test/artefacts/vat-payment-deadlines/y.txt
new file mode 100644
index 00000000000..f2bda7020f2
--- /dev/null
+++ b/test/artefacts/vat-payment-deadlines/y.txt
@@ -0,0 +1,12 @@
+When does your VAT accounting period end?
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/functional/smart_answers_controller_test.rb b/test/functional/smart_answers_controller_test.rb
index ac0b5cb21da..fc94e854668 100644
--- a/test/functional/smart_answers_controller_test.rb
+++ b/test/functional/smart_answers_controller_test.rb
@@ -202,13 +202,14 @@ def teardown
         assert response.body.start_with?("Smart answers controller sample")
       end
 
-      should "render not found for a question node" do
+      should "render govspeak text for a question node" do
         document = stub('Govspeak::Document', to_html: 'html-output')
         Govspeak::Document.stubs(:new).returns(document)
 
         get :show, id: 'smart-answers-controller-sample', started: 'y', format: "txt"
-
-        assert_response :missing
+        assert_match(/Do you like chocolate\?/, response.body)
+        assert_match(/yes\: Yes/, response.body)
+        assert_match(/no\: No/, response.body)
       end
 
       context "when Rails.application.config.expose_govspeak is not set" do
diff --git a/test/regression/smart_answers_regression_test.rb b/test/regression/smart_answers_regression_test.rb
index 037bac30be4..6f630815b06 100644
--- a/test/regression/smart_answers_regression_test.rb
+++ b/test/regression/smart_answers_regression_test.rb
@@ -110,31 +110,30 @@ def teardown_hooks_installed?
       end
 
       should "render and save the first question page" do
-        get :show, id: flow_name, started: 'y', format: 'html'
+        get :show, id: flow_name, started: 'y', format: 'txt'
         assert_response :success
 
-        artefact_path = smart_answer_helper.save_output(['y'], response, extension: 'html')
+        artefact_path = smart_answer_helper.save_output(['y'], response)
         assert_no_output_diff artefact_path if ENV['ASSERT_EACH_ARTEFACT'].present?
       end
 
       visited_nodes = Set.new
       responses_and_expected_results.each do |responses_and_expected_node|
-        next_node    = responses_and_expected_node[:next_node]
-        responses    = responses_and_expected_node[:responses]
-        outcome_node = responses_and_expected_node[:outcome_node]
-
-        if !visited_nodes.include?(next_node) || outcome_node
-          visited_nodes << next_node
-          should "render and save output for responses: #{responses.join(', ')}" do
-            format = outcome_node ? 'txt' : 'html'
-            get :show, id: flow_name, started: 'y', responses: responses.join('/'), format: format
-            assert_response :success
-
-            artefact_path = smart_answer_helper.save_output(responses, response, extension: format)
-
-            # Enabling this more than doubles the time it takes to run regression tests
-            assert_no_output_diff artefact_path if ENV['ASSERT_EACH_ARTEFACT'].present?
-          end
+        next_node     = responses_and_expected_node[:next_node]
+        responses     = responses_and_expected_node[:responses]
+        question_node = !responses_and_expected_node[:outcome_node]
+
+        next if question_node && visited_nodes.include?(next_node)
+        visited_nodes << next_node
+
+        should "render and save output for responses: #{responses.join(', ')}" do
+          get :show, id: flow_name, started: 'y', responses: responses.join('/'), format: 'txt'
+          assert_response :success
+
+          artefact_path = smart_answer_helper.save_output(responses, response)
+
+          # Enabling this more than doubles the time it takes to run regression tests
+          assert_no_output_diff artefact_path if ENV['ASSERT_EACH_ARTEFACT'].present?
         end
       end
 
diff --git a/test/unit/question_presenter_test.rb b/test/unit/question_presenter_test.rb
index 0eb7d27648b..b262e5e425d 100644
--- a/test/unit/question_presenter_test.rb
+++ b/test/unit/question_presenter_test.rb
@@ -58,23 +58,16 @@ class QuestionPresenterTest < ActiveSupport::TestCase
       assert_equal 'body-govspeak', @presenter.body(html: false)
     end
 
-    test '#post_body returns content rendered for post_body block with govspeak processing enabled' do
+    test '#post_body returns content rendered for post_body block with govspeak processing enabled by default' do
       @renderer.stubs(:content_for).with(:post_body, html: true).returns('post-body-html')
 
       assert_equal 'post-body-html', @presenter.post_body
     end
 
-    test '#options returns options with labels and values' do
-      question = Question::MultipleChoice.new(nil, :question_name?)
-      question.option(:option_one)
-      question.option(:option_two)
+    test '#post_body returns content rendered for post body block with govspeak processing disabled' do
+      @renderer.stubs(:content_for).with(:post_body, html: false).returns('post-body-govspeak')
 
-      @renderer.stubs(:option_text).with(:option_one).returns('option-one-text')
-      @renderer.stubs(:option_text).with(:option_two).returns('option-two-text')
-      presenter = QuestionPresenter.new(question, nil, renderer: @renderer)
-
-      assert_equal %w(option_one option_two), presenter.options.map(&:value)
-      assert_equal %w(option-one-text option-two-text), presenter.options.map(&:label)
+      assert_equal 'post-body-govspeak', @presenter.post_body(html: false)
     end
 
     test '#error returns nil if there is no error' do
diff --git a/test/unit/question_with_options_presenter_test.rb b/test/unit/question_with_options_presenter_test.rb
new file mode 100644
index 00000000000..a305bf5cffc
--- /dev/null
+++ b/test/unit/question_with_options_presenter_test.rb
@@ -0,0 +1,22 @@
+require_relative '../test_helper'
+
+module SmartAnswer
+  class QuestionWithOptionsPresenterTest < ActiveSupport::TestCase
+    setup do
+      @renderer = stub('renderer')
+    end
+
+    test '#options returns options with labels and values' do
+      question = Question::MultipleChoice.new(nil, :question_name?)
+      question.option(:option_one)
+      question.option(:option_two)
+
+      @renderer.stubs(:option_text).with(:option_one).returns('option-one-text')
+      @renderer.stubs(:option_text).with(:option_two).returns('option-two-text')
+      presenter = QuestionWithOptionsPresenter.new(question, nil, renderer: @renderer)
+
+      assert_equal %w(option_one option_two), presenter.options.map(&:value)
+      assert_equal %w(option-one-text option-two-text), presenter.options.map(&:label)
+    end
+  end
+end
diff --git a/test/unit/smart_answer_flows/part_year_profit_tax_credits_view_test.rb b/test/unit/smart_answer_flows/part_year_profit_tax_credits_view_test.rb
index f0eb1839d76..e58d5407d26 100644
--- a/test/unit/smart_answer_flows/part_year_profit_tax_credits_view_test.rb
+++ b/test/unit/smart_answer_flows/part_year_profit_tax_credits_view_test.rb
@@ -38,7 +38,7 @@ class PartYearProfitTaxCreditsViewTest < ActiveSupport::TestCase
       setup do
         question = @flow.node(:have_you_stopped_trading?)
         @state = SmartAnswer::State.new(question)
-        @presenter = QuestionPresenter.new(question, @state)
+        @presenter = MultipleChoiceQuestionPresenter.new(question, @state)
       end
 
       should 'have options with labels' do
@@ -56,7 +56,7 @@ class PartYearProfitTaxCreditsViewTest < ActiveSupport::TestCase
         question = @flow.node(:do_your_accounts_cover_a_12_month_period?)
         @state = SmartAnswer::State.new(question)
         @state.accounting_year_ends_on = Date.parse('2016-04-05')
-        @presenter = QuestionPresenter.new(question, @state)
+        @presenter = MultipleChoiceQuestionPresenter.new(question, @state)
       end
 
       should 'display title with interpolated basis_period_ends_on' do
@@ -99,7 +99,7 @@ class PartYearProfitTaxCreditsViewTest < ActiveSupport::TestCase
         question = @flow.node(:did_you_start_trading_before_the_relevant_accounting_year?)
         @state = SmartAnswer::State.new(question)
         @state.accounting_year_begins_on = Date.parse('2015-04-06')
-        @presenter = QuestionPresenter.new(question, @state)
+        @presenter = MultipleChoiceQuestionPresenter.new(question, @state)
       end
 
       should 'have options with labels' do
diff --git a/test/unit/smart_answer_flows/student_finance_forms_view_test.rb b/test/unit/smart_answer_flows/student_finance_forms_view_test.rb
index 6e926208bfe..2eda528a42f 100644
--- a/test/unit/smart_answer_flows/student_finance_forms_view_test.rb
+++ b/test/unit/smart_answer_flows/student_finance_forms_view_test.rb
@@ -11,7 +11,7 @@ class StudentFinanceFormsViewTest < ActiveSupport::TestCase
     def question_presenter(question_name)
       question = @flow.node(question_name)
       state = SmartAnswer::State.new(question)
-      QuestionPresenter.new(question, state)
+      MultipleChoiceQuestionPresenter.new(question, state)
     end
 
     context 'when rendering :continuing_student? question' do