diff --git a/lib/govspeak.rb b/lib/govspeak.rb
index b3a376db..54c859b2 100644
--- a/lib/govspeak.rb
+++ b/lib/govspeak.rb
@@ -1,5 +1,6 @@
 require 'kramdown'
 require 'active_support/core_ext/hash'
+require 'active_support/core_ext/array'
 require 'govspeak/header_extractor'
 require 'govspeak/structured_header_extractor'
 require 'govspeak/html_validator'
@@ -10,6 +11,7 @@
 require 'kramdown/parser/kramdown_with_automatic_external_links'
 require 'htmlentities'
 require 'presenters/attachment_presenter'
+require 'presenters/contact_presenter'
 require 'presenters/h_card_presenter'
 require 'erb'
 
@@ -33,9 +35,9 @@ def initialize(source, options = {})
       options.deep_symbolize_keys!
       @source = source ? source.dup : ""
       @images = options.delete(:images) || []
-      @attachments = Array(options.delete(:attachments))
-      @links = Array(options.delete(:links))
-      @contacts = Array(options.delete(:contacts))
+      @attachments = Array.wrap(options.delete(:attachments))
+      @links = Array.wrap(options.delete(:links))
+      @contacts = Array.wrap(options.delete(:contacts))
       @locale = options.fetch(:locale, "en")
       @options = {input: PARSER_CLASS_NAME}.merge(options)
       @options[:entity_output] = :symbolic
@@ -188,19 +190,22 @@ def insert_strong_inside_p(body, parser=Govspeak::Document)
     end
 
     extension('attachment', /\[embed:attachments:([0-9a-f-]+)\]/) do |content_id, body|
-      attachment = attachments.detect { |a| a.content_id.match(content_id) }
+      attachment = attachments.detect { |a| a[:content_id].match(content_id) }
       next "" unless attachment
       attachment = AttachmentPresenter.new(attachment)
-      content = File.read('lib/govspeak/extension/attachment.html.erb')
+      content = File.read(__dir__ + '/templates/attachment.html.erb')
       ERB.new(content).result(binding)
     end
 
     extension('attachment inline', /\[embed:attachments:inline:([0-9a-f-]+)\]/) do |content_id, body|
-      attachment = attachments.detect { |a| a.content_id.match(content_id) }
+      attachment = attachments.detect { |a| a[:content_id].match(content_id) }
       next "" unless attachment
       attachment = AttachmentPresenter.new(attachment)
-      content = File.read('lib/govspeak/extension/inline_attachment.html.erb')
-      ERB.new(content).result(binding)
+      span_id = attachment.id ? %{ id="attachment_#{attachment.id}"} : ""
+      # new lines inside our title cause problems with govspeak rendering as this is expected to be on one line.
+      link = attachment.link(attachment.title.gsub("\n", " "), attachment.url)
+      attributes = attachment.attachment_attributes.empty? ? "" : " (#{attachment.attachment_attributes})"
+      %{<span#{span_id} class="attachment-inline">#{link}#{attributes}</span>}
     end
 
     def render_image(url, alt_text, caption = nil)
@@ -275,12 +280,12 @@ def self.devolved_options
     end
 
     extension('embed link', /\[embed:link:([0-9a-f-]+)\]/) do |content_id|
-      link = links.detect { |l| l.content_id.match(content_id) }
+      link = links.detect { |l| l[:content_id].match(content_id) }
       next "" unless link
-      if link.url
-        %Q{<a href="#{encode(link.url)}">#{encode(link.title)}</a>}
+      if link[:url]
+        %Q{<a href="#{encode(link[:url])}">#{link[:title]}</a>}
       else
-        encode(link.title)
+        link[:title]
       end
     end
 
@@ -290,9 +295,10 @@ def render_hcard_address(contact)
     private :render_hcard_address
 
     extension('Contact', /\[Contact:([0-9a-f-]+)\]/) do |content_id|
-      contact = contacts.detect { |c| c.content_id.match(content_id) }
+      contact = contacts.detect { |c| c[:content_id].match(content_id) }
       next "" unless contact
-      @renderer ||= ERB.new(File.read('lib/templates/contact.html.erb'))
+      contact = ContactPresenter.new(contact)
+      @renderer ||= ERB.new(File.read(__dir__ + '/templates/contact.html.erb'))
       @renderer.result(binding)
     end
   end
diff --git a/lib/govspeak/extension/inline_attachment.html.erb b/lib/govspeak/extension/inline_attachment.html.erb
deleted file mode 100644
index e6f37096..00000000
--- a/lib/govspeak/extension/inline_attachment.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<span id="attachment_<%= attachment.id %>" class="attachment-inline">
-  <%= attachment.link attachment.title, attachment.url %>
-  (<%= attachment.attachment_attributes %>)
-</span>
diff --git a/lib/presenters/attachment_presenter.rb b/lib/presenters/attachment_presenter.rb
index a77b1f14..dadb9093 100644
--- a/lib/presenters/attachment_presenter.rb
+++ b/lib/presenters/attachment_presenter.rb
@@ -1,77 +1,80 @@
 require "action_view"
 require "money"
+require "htmlentities"
 
 class AttachmentPresenter
   attr_reader :attachment
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::NumberHelper
   include ActionView::Helpers::AssetTagHelper
+  include ActionView::Helpers::TextHelper
 
   def initialize(attachment)
     @attachment = attachment
   end
 
   def id
-    attachment.id
+    attachment[:id]
   end
 
   def order_url
-    attachment.order_url
+    attachment[:order_url]
   end
 
   def opendocument?
-    attachment.opendocument?
+    attachment[:opendocument?]
   end
 
   def url
-    attachment.url
+    attachment[:url]
   end
 
   def external?
-    attachment.external?
+    attachment[:external?]
   end
 
   def price
-    return unless attachment.price
-    Money.from_amount(attachment.price, 'GBP').format
+    return unless attachment[:price]
+    Money.from_amount(attachment[:price], 'GBP').format
   end
 
   def accessible?
-    attachment.accessible?
+    attachment[:accessible?]
   end
 
   def thumbnail_link
     return if hide_thumbnail?
     return if previewable?
-    link(attachment_thumbnail, url, "aria-hidden=true class=#{attachment_class}")
+    link(attachment_thumbnail, url, "aria-hidden" => "true", "class" => attachment_class)
   end
 
   def help_block_toggle_id
-    "attachment-#{attachment.id}-accessibility-request"
+    "attachment-#{id}-accessibility-request"
   end
 
   def section_class
-    attachment.external? ? "hosted-externally" : "embedded"
+    attachment[:external?] ? "hosted-externally" : "embedded"
   end
 
   def mail_to(email_address, name, options = {})
-    "<a href='mailto:#{email_address}?Subject=#{options[:subject]}&body=#{options[:body]}'>#{name}</a>"
+    query_string = options.slice(:subject, :body).map { |k, v| "#{urlencode(k)}=#{urlencode(v)}" }.join("&")
+    "<a href='mailto:#{encode(email_address)}?#{encode(query_string)}'>#{name}</a>"
   end
 
   def alternative_format_order_link
     attachment_info = []
-    attachment_info << "  Title: #{attachment.title}"
-    attachment_info << "  Original format: #{attachment.file_extension}"
-    attachment_info << "  ISBN: #{attachment.isbn}" if attachment.isbn.present?
-    attachment_info << "  Unique reference: #{attachment.unique_reference}" if attachment.unique_reference.present?
-    attachment_info << "  Command paper number: #{attachment.command_paper_number}" if attachment.command_paper_number.present?
-    if attachment.hoc_paper_number.present?
-      attachment_info << "  House of Commons paper number: #{attachment.hoc_paper_number}"
-      attachment_info << "  Parliamentary session: #{attachment.parliamentary_session}"
+    attachment_info << "  Title: #{title}"
+    attachment_info << "  Original format: #{file_extension}" if file_extension.present?
+    attachment_info << "  ISBN: #{attachment[:isbn]}" if attachment[:isbn].present?
+    attachment_info << "  Unique reference: #{attachment[:unique_reference]}" if attachment[:unique_reference].present?
+    attachment_info << "  Command paper number: #{attachment[:command_paper_number]}" if attachment[:command_paper_number].present?
+    if attachment[:hoc_paper_number].present?
+      attachment_info << "  House of Commons paper number: #{attachment[:hoc_paper_number]}"
+      attachment_info << "  Parliamentary session: #{attachment[:parliamentary_session]}"
     end
 
     options = {
-      subject: "Request for '#{attachment.title}' in an alternative format",
+      subject: "Request for '#{title}' in an alternative format",
       body: body_for_mail(attachment_info)
     }
 
@@ -80,7 +83,7 @@ def alternative_format_order_link
 
   def body_for_mail(attachment_info)
     <<-END
-    Details of document required:
+Details of document required:
 
 #{attachment_info.join("\n")}
 
@@ -95,66 +98,93 @@ def alternative_format_contact_email
     "govuk-feedback@digital.cabinet-office.gov.uk"
   end
 
+  # FIXME: usage of image_tag will cause these to render at /images/ which seems
+  # very host dependent. I assume this will need links to static urls.
   def attachment_thumbnail
-    if attachment.pdf?
-      image_tag(attachment.file.thumbnail.url)
-    elsif attachment.html?
+    if file_extension == "pdf" && attachment[:thumbnail_url]
+      image_tag(attachment[:thumbnail_url])
+    elsif file_extension == "html"
       image_tag('pub-cover-html.png')
-    elsif %w{doc docx odt}.include? attachment.file_extension
+    elsif %w{doc docx odt}.include?(file_extension)
       image_tag('pub-cover-doc.png')
-    elsif %w{xls xlsx ods csv}.include? attachment.file_extension
+    elsif %w{xls xlsx ods csv}.include?(file_extension)
       image_tag('pub-cover-spreadsheet.png')
     else
       image_tag('pub-cover.png')
     end
   end
 
-  def references
+  def reference
+    ref = []
+    if attachment[:isbn].present?
+      ref << "ISBN " + content_tag(:span, attachment[:isbn], class: "isbn")
+    end
+
+    if attachment[:unique_reference].present?
+      ref << content_tag(:span, attachment[:unique_reference], class: "unique_reference")
+    end
+
+    if attachment[:command_paper_number].present?
+      ref << content_tag(:span, attachment[:command_paper_number], class: "command_paper_number")
+    end
+
+    if attachment[:hoc_paper_number].present?
+      ref << content_tag(:span, "HC #{attachment[:hoc_paper_number]}", class: 'house_of_commons_paper_number') + ' ' +
+        content_tag(:span, attachment[:parliamentary_session], class: 'parliamentary_session')
+    end
+
+    ref.join(', ').html_safe
+  end
+
+  # FIXME this has english in it so will cause problems if the locale is not en
+  def references_for_title
     references = []
-    references << "ISBN: #{attachment.isbn}" if attachment.isbn.present?
-    references << "Unique reference: #{attachment.unique_reference}" if attachment.unique_reference.present?
-    references << "Command paper number: #{attachment.command_paper_number}" if attachment.command_paper_number.present?
-    references << "HC: #{attachment.hoc_paper_number} #{attachment.parliamentary_session}" if attachment.hoc_paper_number.present?
+    references << "ISBN: #{attachment[:isbn]}" if attachment[:isbn].present?
+    references << "Unique reference: #{attachment[:unique_reference]}" if attachment[:unique_reference].present?
+    references << "Command paper number: #{attachment[:command_paper_number]}" if attachment[:command_paper_number].present?
+    references << "HC: #{attachment[:hoc_paper_number]} #{attachment[:parliamentary_session]}" if attachment[:hoc_paper_number].present?
     prefix = references.size == 1 ? "and its reference" : "and its references"
     references.any? ? ", #{prefix} (" + references.join(", ") + ")" : ""
   end
 
   def references?
-    !attachment.isbn.to_s.empty? || !attachment.unique_reference.to_s.empty? || !attachment.command_paper_number.to_s.empty? || !attachment.hoc_paper_number.to_s.empty?
+    !attachment[:isbn].to_s.empty? || !attachment[:unique_reference].to_s.empty? || !attachment[:command_paper_number].to_s.empty? || !attachment[:hoc_paper_number].to_s.empty?
   end
 
   def attachment_class
-    attachment.external? ? "hosted-externally" : "embedded"
+    attachment[:external?] ? "hosted-externally" : "embedded"
   end
 
   def unnumbered_paper?
-    attachment.unnumbered_command_paper? || attachment.unnumbered_hoc_paper?
+    attachment[:unnumbered_command_paper?] || attachment[:unnumbered_hoc_paper?]
   end
 
   def unnumbered_command_paper?
-    attachment.unnumbered_command_paper?
+    attachment[:unnumbered_command_paper?]
   end
 
   def download_link
-    link(attachment.preview_url, "<strong>Download #{attachment.file_extension.upcase}</strong>", number_to_human_size(attachment.file_size))
+    options = {}
+    options[:title] = number_to_human_size(attachment[:file_size]) if attachment[:file_size].present?
+    link("<strong>Download #{file_extension.upcase}</strong>", attachment[:url], options)
   end
 
   def attachment_attributes
     attributes = []
-    if attachment.html?
+    if file_extension == "html"
       attributes << content_tag(:span, 'HTML', class: 'type')
-    elsif attachment.external?
+    elsif attachment[:external?]
       attributes << content_tag(:span, url, class: 'url')
     else
-      attributes << content_tag(:span, humanized_content_type(attachment.file_extension), class: 'type')
-      attributes << content_tag(:span, number_to_human_size(attachment.file_size), class: 'file-size')
-      attributes << content_tag(:span, pluralize(attachment.number_of_pages, "page") , class: 'page-length') if attachment.number_of_pages.present?
+      attributes << content_tag(:span, humanized_content_type(file_extension), class: 'type') if file_extension
+      attributes << content_tag(:span, number_to_human_size(attachment[:file_size]), class: 'file-size') if attachment[:file_size]
+      attributes << content_tag(:span, pluralize(attachment[:number_of_pages], "page"), class: 'page-length') if attachment[:number_of_pages]
     end
     attributes.join(', ').html_safe
   end
 
   def preview_url
-    url << '/preview'
+    url + '/preview'
   end
 
   MS_WORD_DOCUMENT_HUMANIZED_CONTENT_TYPE = "MS Word Document"
@@ -205,37 +235,52 @@ def humanized_content_type(file_extension)
   end
 
   def previewable?
-    attachment.csv?
+    file_extension == "csv"
   end
 
   def title
-    attachment.title
+    attachment[:title]
+  end
+
+  def file_extension
+    # Note: this is a separate parameter rather than being calculated from the
+    # filename because at the time of writing not all apps were using the effects
+    # of this field.
+    attachment[:file_extension]
   end
 
   def hide_thumbnail?
     defined?(hide_thumbnail) && hide_thumbnail
   end
 
-  def attachement_details
+  def attachment_details
     return if previewable?
-    link(attachment.title, url, title_link_options)
+    link(title, url, title_link_options)
   end
 
   def title_link_options
-    title_link_options = ''
-    title_link_options << "rel=external" if attachment.external?
-    title_link_options << "aria-describedby=#{help_block_id}" unless attachment.accessible?
+    title_link_options = {}
+    title_link_options["rel"] = "external" if attachment[:external?]
+    title_link_options["aria-describedby"] = help_block_id unless attachment[:accessible?]
+    title_link_options
   end
 
   def help_block_id
-    "attachment-#{attachment.id}-accessibility-help"
+    "attachment-#{id}-accessibility-help"
   end
 
-  def link(body, url, options={})
-    <<-END
-      <a href="#{url} #{options}">
-        #{body}
-      </a>
-    END
+  def link(body, url, options = {})
+    options_str = options.map { |k, v| %{#{encode(k)}="#{encode(v)}"} }.join(" ")
+    %{<a href="#{encode(url)}" #{options_str}>#{body}</a>}
+  end
+
+private
+
+  def encode(text)
+    HTMLEntities.new.encode(text)
+  end
+
+  def urlencode(text)
+    ERB::Util.url_encode(text)
   end
 end
diff --git a/lib/presenters/contact_presenter.rb b/lib/presenters/contact_presenter.rb
new file mode 100644
index 00000000..d81f1cec
--- /dev/null
+++ b/lib/presenters/contact_presenter.rb
@@ -0,0 +1,22 @@
+require 'active_support/core_ext/array'
+require 'ostruct'
+
+class ContactPresenter
+  attr_reader :contact
+  delegate :id, :content_id, :title, :recipient, :street_address, :postal_code,
+    :locality, :region, :country_code, :country_name, :email, :contact_form_url,
+    :comments, :worldwide_organisation_path, to: :contact
+
+  def initialize(contact)
+    @contact = OpenStruct.new(contact)
+  end
+
+  def contact_numbers
+    Array.wrap(contact[:contact_numbers])
+  end
+
+  def has_postal_address?
+    recipient.present? || street_address.present? || locality.present? ||
+    region.present? || postal_code.present?
+  end
+end
diff --git a/lib/govspeak/extension/attachment.html.erb b/lib/templates/attachment.html.erb
similarity index 73%
rename from lib/govspeak/extension/attachment.html.erb
rename to lib/templates/attachment.html.erb
index f419a4bd..0c39351f 100644
--- a/lib/govspeak/extension/attachment.html.erb
+++ b/lib/templates/attachment.html.erb
@@ -3,12 +3,10 @@
     <%= attachment.thumbnail_link %>
   </div>
   <div class="attachment-details">
-    <h2 class="title"><%= attachment.attachement_details %></h2>
+    <h2 class="title"><%= attachment.attachment_details %></h2>
     <p class="metadata">
       <% if attachment.references? %>
-        <span class="references">
-          <%= t('attachment.headings.reference') %>: <%= attachment.references %>
-        </span>
+        <span class="references"><%= t('attachment.headings.reference') %>: <%= attachment.reference %></span>
       <% end %>
       <% if attachment.unnumbered_paper? %>
         <span class="unnumbered-paper">
@@ -21,13 +19,9 @@
       <% end %>
       <% if attachment.previewable? %>
         <span class="preview">
-          <strong>
-            <%= attachment.link("View online", attachment.preview_url) %>
-          </strong>
-        </span>
-        <span class="download">
-          attachment.download_link
+          <strong><%= attachment.link("View online", attachment.preview_url) %></strong>
         </span>
+        <span class="download"><%= attachment.download_link %></span>
       <% else %>
         <%= attachment.attachment_attributes %>
       <% end %>
@@ -35,10 +29,8 @@
     <% if attachment.order_url.present? %>
       <p>
         <%= attachment.link t('attachment.headings.order_a_copy'), attachment.order_url,
-            class: "order_url", title: t('attachment.headings.order_a_copy_full') %>
-        <% if attachment.price %>
-          (<span class="price"><%= attachment.price %></span>)
-        <% end %>
+          class: "order_url", title: t('attachment.headings.order_a_copy_full')
+        %><% if attachment.price %>(<span class="price"><%= attachment.price %></span>)<% end %>
       </p>
     <% end %>
 
@@ -57,7 +49,7 @@
           <%= t('attachment.accessibility.full_help_html',
                 email: attachment.alternative_format_order_link,
                 title: attachment.title,
-                references: attachment.references) %>
+                references: attachment.references_for_title) %>
         </p>
       </div>
     <% end %>
diff --git a/lib/templates/contact.html.erb b/lib/templates/contact.html.erb
index bcd593d2..fee423fb 100644
--- a/lib/templates/contact.html.erb
+++ b/lib/templates/contact.html.erb
@@ -25,8 +25,8 @@
       <% end %>
       <% contact.contact_numbers.each do |number| %>
         <p class="tel">
-          <span class="type"><%= number.label %></span>
-          <%= number.number %>
+          <span class="type"><%= number[:label] %></span>
+          <%= number[:number] %>
         </p>
       <% end %>
       </div>
diff --git a/lib/templates/inline_attachment.html.erb b/lib/templates/inline_attachment.html.erb
new file mode 100644
index 00000000..700fe651
--- /dev/null
+++ b/lib/templates/inline_attachment.html.erb
@@ -0,0 +1,6 @@
+<span <% if attachment.id %>id="attachment_<%= attachment.id %>" <% end %>class="attachment-inline">
+  <%= attachment.link attachment.title, attachment.url %>
+  <% unless attachment.attachment_attributes.empty? %>
+    (<%= attachment.attachment_attributes %>)
+  <% end %>
+</span>
diff --git a/test/govspeak_attachments_inline_test.rb b/test/govspeak_attachments_inline_test.rb
new file mode 100644
index 00000000..538e15b5
--- /dev/null
+++ b/test/govspeak_attachments_inline_test.rb
@@ -0,0 +1,146 @@
+# encoding: UTF-8
+
+require 'test_helper'
+
+class GovspeakAttachmentsInlineTest < Minitest::Test
+  def build_attachment(args = {})
+    {
+      content_id: "2b4d92f3-f8cd-4284-aaaa-25b3a640d26c",
+      id: 456,
+      url: "http://example.com/attachment.pdf",
+      title: "Attachment Title",
+    }.merge(args)
+  end
+
+  def render_govspeak(govspeak, attachments = [])
+    Govspeak::Document.new(govspeak, attachments: attachments).to_html
+  end
+
+  test "renders an empty string for an inline attachment not found" do
+    assert_match("", render_govspeak("[embed:attachments:inline:1fe8]", [build_attachment]))
+  end
+
+  test "wraps an attachment in a span with the id if the id is present" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(id: 10, content_id: "1fe8")]
+    )
+    assert_match(/span id="attachment_10" class="attachment-inline">/, rendered)
+  end
+
+  test "wraps an attachment in a span without the id if the id is not present" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(id: nil, content_id: "1fe8")]
+    )
+    assert_match(/span class="attachment-inline">/, rendered)
+  end
+
+  test "links to the attachment file" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", title: "My Pdf")]
+    )
+    assert_match(%r{<a href="http://a.b/f.pdf">My Pdf</a>}, rendered)
+  end
+
+  test "renders on a single line" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:2bc1]",
+      [build_attachment(content_id: "2bc1", external?: true)]
+    )
+    assert_match(%r{<span id="attachment[^\n]*</span>}, rendered)
+  end
+
+  test "doesn't have spaces between the span and the link" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:2bc1]",
+      [build_attachment(content_id: "2bc1", id: nil)]
+    )
+    assert_match(%r{<span class="attachment-inline"><a href=".*">.*</a></span>}, rendered)
+  end
+
+  test "will show HTML type (in brackets) if file_extension is specified as html" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(content_id: "1fe8", file_extension: "html")]
+    )
+    assert_match(%r{(<span class="type">HTML</span>)}, rendered)
+  end
+
+  test "will show url (in brackets) if specified as external" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", external?: true)]
+    )
+    assert_match(%r{(<span class="url">http://a.b/f.pdf</span>)}, rendered)
+  end
+
+  test "will not show url if file_extension is specified as html" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", file_extension: "html", external?: true)]
+    )
+    refute_match(%r{(<span class="url">http://a.b/f.pdf</span>)}, rendered)
+  end
+
+  test "will show a file extension in a abbr element for non html" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(content_id: "1fe8", file_extension: "csv")]
+    )
+    refute_match(%r{<span class="type"><abbr title="Comma-separated values">CSV</abbr></span>}, rendered)
+  end
+
+  test "will show file size in a span" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(content_id: "1fe8", file_size: 1024)]
+    )
+    assert_match(%r{<span class="file-size">1 KB</span>}, rendered)
+  end
+
+  test "will show number of pages" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(content_id: "1fe8", number_of_pages: 1)]
+    )
+    assert_match(%r{<span class="page-length">1 page</span>}, rendered)
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(content_id: "1fe8", number_of_pages: 2)]
+    )
+    assert_match(%r{<span class="page-length">2 pages</span>}, rendered)
+  end
+
+  test "will show attributes after link" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8]",
+      [build_attachment(
+        content_id: "1fe8",
+        url: "http://a.b/test.txt",
+        title: "My Attached Text File",
+        file_extension: "txt",
+        file_size: 2048,
+        number_of_pages: 2,
+      )]
+    )
+    link = %{<a href="#{Regexp.quote('http://a.b/test.txt')}">My Attached Text File</a>}
+    type = %{<span class="type">Plain text</span>}
+    file_size = %{<span class="file-size">2 KB</span>}
+    pages = %{<span class="page-length">2 pages</span>}
+    assert_match(/#{link}\s+\(#{type}, #{file_size}, #{pages}\)/, rendered)
+  end
+
+  test "can render two inline attachments on the same line" do
+    rendered = render_govspeak(
+      "[embed:attachments:inline:1fe8] and [embed:attachments:inline:2abc]",
+      [
+        build_attachment(content_id: "1fe8", url: "http://a.b/test.txt", title: "Text File"),
+        build_attachment(content_id: "2abc", url: "http://a.b/test.pdf", title: "PDF File")
+      ]
+    )
+    assert_match(%r{<a href="http://a.b/test.txt">Text File</a>}, rendered)
+    assert_match(%r{<a href="http://a.b/test.pdf">PDF File</a>}, rendered)
+  end
+end
diff --git a/test/govspeak_attachments_test.rb b/test/govspeak_attachments_test.rb
new file mode 100644
index 00000000..35d72cf7
--- /dev/null
+++ b/test/govspeak_attachments_test.rb
@@ -0,0 +1,397 @@
+# encoding: UTF-8
+
+require 'test_helper'
+
+class GovspeakAttachmentTest < Minitest::Test
+  def build_attachment(args = {})
+    {
+      content_id: "2b4d92f3-f8cd-4284-aaaa-25b3a640d26c",
+      id: 456,
+      url: "http://example.com/attachment.pdf",
+      title: "Attachment Title",
+    }.merge(args)
+  end
+
+  def compress_html(html)
+    html.gsub(/[\n\r]+[\s]*/, '')
+  end
+
+  def render_govspeak(govspeak, attachments = [], options = {})
+    options = options.merge(attachments: attachments)
+    Govspeak::Document.new(govspeak, options).to_html
+  end
+
+  test "Wraps an attachment in a section.attachment.embedded" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2")]
+    )
+    assert_match(/<section class="attachment embedded">/, rendered)
+  end
+
+  test "Wraps an external attachment in a section.attachment.hosted-externally" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", external?: true)]
+    )
+    assert_match(/<section class="attachment hosted-externally">/, rendered)
+  end
+
+  test "Outputs a pub-cover.png thumbnail by default" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2")]
+    )
+    assert_match(%r{<img src="/images/pub-cover.png"}, rendered)
+  end
+
+  test "Outputs a specified thumbnail for a pdf with a thumbnail_url" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "pdf", thumbnail_url: "http://a.b/custom.png")]
+    )
+    assert_match(%r{<img src="http://a.b/custom.png"}, rendered)
+  end
+
+  test "Outputs pub-cover.png for a pdf without thumbnail_url" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "pdf", thumbnail_url: nil)]
+    )
+    assert_match(%r{<img src="/images/pub-cover.png"}, rendered)
+  end
+
+  test "Outputs pub-cover-html.png for a file with html file_extension" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "html")]
+    )
+    assert_match(%r{<img src="/images/pub-cover-html.png"}, rendered)
+  end
+
+  test "Outputs pub-cover-doc.png for a file with docx file_extension" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "docx")]
+    )
+    assert_match(%r{<img src="/images/pub-cover-doc.png"}, rendered)
+  end
+
+  test "Outputs pub-cover-spreadsheet.png for a file with xls file_extension" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "xls")]
+    )
+    assert_match(%r{<img src="/images/pub-cover-spreadsheet.png"}, rendered)
+  end
+
+  test "Outputs no thumbnail for a previewable file" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "csv")]
+    )
+    assert_match(%r{<div class="attachment-thumb"></div>}, compress_html(rendered))
+  end
+
+  test "Outputs a title link within a h2" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", id: 1, url: "http://a.b/c.pdf", title: "Attachment Title")]
+    )
+    assert_match(%r{<h2 class="title">\s*<a href="http://a.b/c.pdf" aria-describedby="attachment-1-accessibility-help">Attachment Title</a></h2>}, compress_html(rendered))
+  end
+
+  test "Title link has rel='external' for an external link" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", id: 1, url: "http://a.b/c.pdf", external?: true)]
+    )
+    assert_match(%r{<a href="http://a.b/c.pdf" rel="external" aria-describedby="attachment-1-accessibility-help">}, rendered)
+  end
+
+  test "Accessible attachment doesn't have the aria-describedby attribute" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", url: "http://a.b/c.pdf", accessible?: true)]
+    )
+    assert_match(%r{<a href="http://a.b/c.pdf">}, rendered)
+  end
+
+  test "Outputs reference if isbn is present" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", isbn: "123")]
+    )
+    assert_match(%r{<span class="references">Ref: ISBN <span class="isbn">123</span></span>}, rendered)
+  end
+
+  test "Outputs reference if uniuque_reference is present" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", unique_reference: "123")]
+    )
+    assert_match(%r{<span class="references">Ref: <span class="unique_reference">123</span></span>}, rendered)
+  end
+
+  test "Outputs reference if command_paper_number is present" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", command_paper_number: "11")]
+    )
+    assert_match(%r{<span class="references">Ref: <span class="command_paper_number">11</span></span>}, rendered)
+  end
+
+  test "Outputs reference if hoc_paper_number is present" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", hoc_paper_number: "15", parliamentary_session: "1")]
+    )
+    assert_match(%r{<span class="references">Ref: <span class="house_of_commons_paper_number">HC 15</span> <span class="parliamentary_session">1</span></span>}, rendered)
+  end
+
+  test "Can have multiple references" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", isbn: "123", unique_reference: "55")]
+    )
+    assert_match(%r{<span class="references">Ref: ISBN <span class="isbn">123</span>, <span class="unique_reference">55</span></span>}, rendered)
+  end
+
+  test "can show an unnumbered command paper" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", unnumbered_command_paper?: true)]
+    )
+    assert_match(%r{<span class="unnumbered-paper">\s*Unnumbered command paper\s*</span>}, compress_html(rendered))
+  end
+
+  test "can show an unnumbered act paper" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", unnumbered_hoc_paper?: true)]
+    )
+    assert_match(%r{<span class="unnumbered-paper">\s*Unnumbered act paper\s*</span>}, compress_html(rendered))
+  end
+
+  test "Unnumbered command paper takes precedence to unnumbered act paper" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", unnumbered_command_paper?: true, unnumbered_hoc_paper?: true)]
+    )
+    assert_match(%r{<span class="unnumbered-paper">\s*Unnumbered command paper\s*</span>}, compress_html(rendered))
+  end
+
+  test "Shows a preview link for a previewable format" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "csv", url: "http://a.b/c.csv")]
+    )
+    assert_match(%r{<span class="preview"><strong>\s*<a href="http://a.b/c.csv/preview">View online</a>\s*</strong></span>}, compress_html(rendered))
+  end
+
+  test "Shows a download link for a previewable format" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "csv", url: "http://a.b/c.csv")]
+    )
+    assert_match(%r{<span class="download">\s*<a href="http://a.b/c.csv"><strong>Download CSV</strong></a>s*</span>}, compress_html(rendered))
+  end
+
+  test "Can show filesize for a download link for a previewable format" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "csv", url: "http://a.b/c.csv", file_size: 2048)]
+    )
+    assert_match(%r{<a href="http://a.b/c.csv" title="2 KB">}, rendered)
+  end
+
+  test "for a HTML format it outputs HTML" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", file_extension: "html")]
+    )
+    assert_match(%r{<span class="type">HTML</span>}, rendered)
+  end
+
+  test "for an external type it outputs the url" do
+    rendered = render_govspeak(
+      "[embed:attachments:3ed2]",
+      [build_attachment(content_id: "3ed2", url: "http://a.b/c.pdf", external?: true)]
+    )
+    assert_match(%r{<span class="url">http://a.b/c.pdf</span>}, rendered)
+  end
+
+  test "will show a file extension in a abbr element for non html" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", file_extension: "pdf")]
+    )
+    assert_match(%r{<span class="type"><abbr title="Portable Document Format">PDF</abbr></span>}, rendered)
+  end
+
+  test "will show file size in a span" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", file_size: 1024)]
+    )
+    assert_match(%r{<span class="file-size">1 KB</span>}, rendered)
+  end
+
+  test "will show number of pages" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", number_of_pages: 1)]
+    )
+    assert_match(%r{<span class="page-length">1 page</span>}, rendered)
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", number_of_pages: 2)]
+    )
+    assert_match(%r{<span class="page-length">2 pages</span>}, rendered)
+  end
+
+  test "can show multiple attributes separated by a comma" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", file_extension: "pdf", file_size: 1024)]
+    )
+    pdf = %{<span class="type"><abbr title="Portable Document Format">PDF</abbr></span>}
+    file_size = %{<span class="file-size">1 KB</span>}
+    assert_match(%r{#{pdf}, #{file_size}}, rendered)
+  end
+
+  test "can show a link to order a copy of the attachment" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", order_url: "http://a.b/c")]
+    )
+    assert_match(%r{<a href="http://a.b/c" class="order_url" title="Order a copy of the publication">Order a copy</a>}, rendered)
+  end
+
+  test "can not show a link to order a copy of the attachment" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", order_url: "nil")]
+    )
+    refute_match(%r{<a href="http://a.b/c" class="order_url" title="Order a copy of the publication">Order a copy</a>}, rendered)
+  end
+
+  test "can show a price for ordering a copy of the attachment" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", order_url: "http://a.b/c", price: 10)]
+    )
+    assert_match(%r{(<span class="price">£10.00</span>)}, rendered)
+  end
+
+  test "can show opendocument help" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", opendocument?: true)]
+    )
+    assert_match(%r{<p class="opendocument-help">}, rendered)
+  end
+
+  test "can not show opendocument help" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", opendocument?: false)]
+    )
+    refute_match(%r{<p class="opendocument-help">}, rendered)
+  end
+
+  test "can show an accessibility warning" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", id: 10, accessible?: false)]
+    )
+    assert_match(%r{<div data-module="toggle" class="accessibility-warning" id="attachment-10-accessibility-help">}, rendered)
+  end
+
+  test "can not show an accessibility warning" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", id: 10, accessible?: true)]
+    )
+    refute_match(%r{<div data-module="toggle" class="accessibility-warning" id="attachment-10-accessibility-help">}, rendered)
+  end
+
+  test "shows accessibility mailto on a single line" do
+    rendered = render_govspeak(
+      "[embed:attachments:1fe8]",
+      [build_attachment(content_id: "1fe8", id: 10, accessible?: false)]
+    )
+    assert_match(%r{<a href="mailto:govuk-feedback@digital.cabinet-office.gov.uk\?subject=[^\n]*&amp;body=[^\n]*">govuk-feedback@digital.cabinet-office.gov.uk</a>}, rendered)
+  end
+
+  Dir.glob("locales/*.yml") do |filename|
+    locale = File.basename(filename, ".yml")
+    test "can render in #{locale}" do
+      rendered = render_govspeak(
+        "[embed:attachments:3ed2]",
+        [build_attachment(content_id: "3ed2")],
+        locale: locale,
+      )
+      assert_match(/<section class="attachment embedded">/, rendered)
+    end
+  end
+
+  test "a full attachment rendering looks correct" do
+    attachment = {
+      id: 123,
+      content_id: "2b4d92f3-f8cd-4284-aaaa-25b3a640d26c",
+      title: "Attachment Title",
+      url: "http://example.com/test.pdf",
+      opendocument?: true,
+      order_url: "http://example.com/order",
+      price: 12.3,
+      isbn: "isbn-123",
+      unnumbered_command_paper?: true,
+    }
+    rendered = render_govspeak(
+      "[embed:attachments:2b4d92f3-f8cd-4284-aaaa-25b3a640d26c]",
+      [build_attachment(attachment)]
+    )
+    expected_html_output = %{
+      <section class="attachment embedded">
+        <div class="attachment-thumb">
+          <a href="http://example.com/test.pdf" aria-hidden="true" class="embedded"><img src="/images/pub-cover.png" alt="Pub cover"></a>
+        </div>
+        <div class="attachment-details">
+          <h2 class="title">
+            <a href="http://example.com/test.pdf" aria-describedby="attachment-123-accessibility-help">Attachment Title</a>
+          </h2>
+          <p class="metadata">
+            <span class="references">Ref: ISBN <span class="isbn">isbn-123</span></span>
+            <span class="unnumbered-paper">
+              Unnumbered command paper
+            </span>
+          </p>
+          <p>
+            <a href="http://example.com/order" class="order_url" title="Order a copy of the publication">Order a copy</a>(<span class="price">£12.30</span>)
+          </p>
+          <p class="opendocument-help">
+            This file is in an <a rel="external" href="https://en.wikipedia.org/wiki/OpenDocument_software">OpenDocument</a> format
+          </p>
+          <div data-module="toggle" class="accessibility-warning" id="attachment-123-accessibility-help">
+            <h2>This file may not be suitable for users of assistive technology.
+              <a class="toggler" href="#attachment-123-accessibility-request" data-controls="attachment-123-accessibility-request" data-expanded="false">Request an accessible format.</a>
+            </h2>
+            <p id="attachment-123-accessibility-request" class="js-hidden">
+              If you use assistive technology (eg a screen reader) and need a
+              version of this document in a more accessible format, please email <a href="mailto:govuk-feedback@digital.cabinet-office.gov.uk?subject=Request%20for%20%27Attachment%20Title%27%20in%20an%20alternative%20format&amp;body=Details%20of%20document%20required%3A%0A%0A%20%20Title%3A%20Attachment%20Title%0A%20%20ISBN%3A%20isbn-123%0A%0APlease%20tell%20us%3A%0A%0A%20%201.%20What%20makes%20this%20format%20unsuitable%20for%20you%3F%0A%20%202.%20What%20format%20you%20would%20prefer%3F%0A">govuk-feedback@digital.cabinet-office.gov.uk</a>.
+              Please tell us what format you need. It will help us if you say what assistive technology you use.
+            </p>
+          </div>
+        </div>
+      </section>
+    }
+    assert_equal(compress_html(expected_html_output), compress_html(rendered))
+  end
+
+  test "attachment that isn't provided" do
+    govspeak = "[embed:attachments:906ac8b7-850d-45c6-98e0-9525c680f891]"
+    rendered = Govspeak::Document.new(govspeak).to_html
+    assert_match("", rendered)
+  end
+end
diff --git a/test/govspeak_contacts_test.rb b/test/govspeak_contacts_test.rb
index 1309ecac..fdfde7fe 100644
--- a/test/govspeak_contacts_test.rb
+++ b/test/govspeak_contacts_test.rb
@@ -1,13 +1,11 @@
 # encoding: UTF-8
 
 require 'test_helper'
-require 'ostruct'
 
 class GovspeakContactsTest < Minitest::Test
 
   def build_contact(attrs={})
-    OpenStruct.new(
-      has_postal_address?: attrs.fetch(:has_postal_address?, true),
+    {
       id: attrs.fetch(:id, 123456),
       content_id: attrs.fetch(:content_id, "4f3383e4-48a2-4461-a41d-f85ea8b89ba0"),
       title: attrs.fetch(:title, "Government Digital Service"),
@@ -20,10 +18,10 @@ def build_contact(attrs={})
       email: attrs.fetch(:email, "people@digital.cabinet-office.gov.uk"),
       contact_form_url: attrs.fetch(:contact_form_url, ""),
       contact_numbers: attrs.fetch(:contact_numbers,
-                                   [OpenStruct.new(label: "helpdesk", number: "+4412345 67890")]),
+                                   [{ label: "helpdesk", number: "+4412345 67890" }]),
       comments: attrs.fetch(:comments, ""),
       worldwide_organisation_path: attrs.fetch(:worldwide_organisation_path, nil),
-    )
+    }
   end
 
   def compress_html(html)
@@ -77,7 +75,13 @@ def compress_html(html)
   end
 
   test "contact with no postal address omits the address info" do
-    contact = build_contact(has_postal_address?: false)
+    contact = build_contact(
+      recipient: nil,
+      street_address: nil,
+      locality: nil,
+      region: nil,
+      postal_code: nil,
+    )
     govspeak = "[Contact:4f3383e4-48a2-4461-a41d-f85ea8b89ba0]"
     rendered = Govspeak::Document.new(govspeak, { contacts: [contact] }).to_html
     expected_html_output = %{
diff --git a/test/govspeak_link_test.rb b/test/govspeak_link_test.rb
new file mode 100644
index 00000000..9135bc87
--- /dev/null
+++ b/test/govspeak_link_test.rb
@@ -0,0 +1,45 @@
+# encoding: UTF-8
+
+require 'test_helper'
+
+class GovspeakLinkTest < Minitest::Test
+  test "embedded link with link provided" do
+    link = {
+      content_id: "5572fee5-f38f-4641-8ffa-64fed9230ad4",
+      url: "https://www.example.com/",
+      title: "Example website"
+    }
+    govspeak = "[embed:link:5572fee5-f38f-4641-8ffa-64fed9230ad4]"
+    rendered = Govspeak::Document.new(govspeak, links: link).to_html
+    expected = %r{<a href="https://www.example.com/">Example website</a>}
+    assert_match(expected, rendered)
+  end
+
+  test "embedded link with markdown title" do
+    link = {
+      content_id: "5572fee5-f38f-4641-8ffa-64fed9230ad4",
+      url: "https://www.example.com/",
+      title: "**Example website**"
+    }
+    govspeak = "[embed:link:5572fee5-f38f-4641-8ffa-64fed9230ad4]"
+    rendered = Govspeak::Document.new(govspeak, links: link).to_html
+    expected = %r{<a href="https://www.example.com/"><strong>Example website</strong></a>}
+    assert_match(expected, rendered)
+  end
+
+  test "embedded link with url not provided" do
+    link = {
+      content_id: "e510f1c1-4862-4333-889c-8d3acd443fbf",
+      title: "Example website",
+    }
+    govspeak = "[embed:link:e510f1c1-4862-4333-889c-8d3acd443fbf]"
+    rendered = Govspeak::Document.new(govspeak, links: link).to_html
+    assert_match("Example website", rendered)
+  end
+
+  test "embedded link without link object" do
+    govspeak = "[embed:link:0726637c-8c66-47ad-834a-d815cbf51e0e]"
+    rendered = Govspeak::Document.new(govspeak).to_html
+    assert_match("", rendered)
+  end
+end
diff --git a/test/govspeak_test.rb b/test/govspeak_test.rb
index 3620f9d6..967af49b 100644
--- a/test/govspeak_test.rb
+++ b/test/govspeak_test.rb
@@ -874,73 +874,4 @@ class GovspeakTest < Minitest::Test
       |
     end
   end
-
-  test "inline attachment" do
-    attachment = OpenStruct.new(
-      content_id: "2b4d92f3-f8cd-4284-aaaa-25b3a640d26c",
-      id: 456,
-    )
-    govspeak = "[embed:attachments:inline:2b4d92f3-f8cd-4284-aaaa-25b3a640d26c]"
-    rendered = Govspeak::Document.new(govspeak, {attachments: attachment}).to_html
-    assert_match(/<span id=\"attachment_456\" class=\"attachment-inline\">/, rendered)
-  end
-
-  test "attachment" do
-    attachment = OpenStruct.new(
-      url: "www.test.com",
-      content_id: "2b4d92f3-f8cd-4284-aaaa-25b3a640d26c",
-      id: 123,
-      opendocument?: true,
-      order_url: "www.test.com",
-      price: 12.3,
-      csv?: true,
-      unnumbered_command_paper?: true,
-      isbn: 'isbn-123',
-    )
-    govspeak = "[embed:attachments:2b4d92f3-f8cd-4284-aaaa-25b3a640d26c]"
-    rendered = Govspeak::Document.new(govspeak, {attachments: attachment}).to_html
-    assert_match(/<section class=\"attachment embedded\">/, rendered)
-    assert_match(/<div class=\"attachment-thumb\">/, rendered)
-    assert_match(/attachment-123-accessibility-help/, rendered)
-    assert_match(/If you use assistive technology/, rendered)
-    assert_match(/<p class=\"opendocument-help\">/, rendered)
-    assert_match(/<span class=\"price\">£12.30/, rendered)
-    assert_match(/<span class=\"preview\">/, rendered)
-    assert_match(/<span class=\"unnumbered-paper\">/, rendered)
-    assert_match(/<span class=\"references\">/, rendered)
-  end
-
-  test "attachment that isn't provided" do
-    govspeak = "[embed:attachments:906ac8b7-850d-45c6-98e0-9525c680f891]"
-    rendered = Govspeak::Document.new(govspeak).to_html
-    assert_match("", rendered)
-  end
-
-  test "embedded link with link provided" do
-    link = OpenStruct.new(
-      content_id: "5572fee5-f38f-4641-8ffa-64fed9230ad4",
-      url: "https://www.example.com/",
-      title: "Example website"
-    )
-    govspeak = "[embed:link:5572fee5-f38f-4641-8ffa-64fed9230ad4]"
-    rendered = Govspeak::Document.new(govspeak, {links: link}).to_html
-    expected = %r{<a href="https://www.example.com/">Example website</a>}
-    assert_match(expected, rendered)
-  end
-
-  test "embedded link with link not provided" do
-    link = OpenStruct.new(
-      content_id: "e510f1c1-4862-4333-889c-8d3acd443fbf",
-      title: "Example website",
-    )
-    govspeak = "[embed:link:e510f1c1-4862-4333-889c-8d3acd443fbf]"
-    rendered = Govspeak::Document.new(govspeak, {links: link}).to_html
-    assert_match("Example website", rendered)
-  end
-
-  test "embedded link without link object" do
-    govspeak = "[embed:link:0726637c-8c66-47ad-834a-d815cbf51e0e]"
-    rendered = Govspeak::Document.new(govspeak).to_html
-    assert_match("", rendered)
-  end
 end