diff --git a/components/array-object-table/src/__snapshots__/test.js.snap b/components/array-object-table/src/__snapshots__/test.js.snap
index f114c5e..f482bf6 100644
--- a/components/array-object-table/src/__snapshots__/test.js.snap
+++ b/components/array-object-table/src/__snapshots__/test.js.snap
@@ -1,11 +1,28 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ArrayObjectTable matches snapshot 1`] = `
+.emotion-14 {
+  margin-bottom: 15px;
+}
+
+@media only screen and (min-width:641px) {
+  .emotion-14 {
+    margin-bottom: 15px;
+  }
+}
+
 .emotion-12 {
   display: table;
   font-family: "nta",Arial,sans-serif;
   width: 100%;
   table-layout: fixed;
+  margin-bottom: 15px;
+}
+
+@media only screen and (min-width:641px) {
+  .emotion-12 {
+    margin-bottom: 15px;
+  }
 }
 
 .emotion-0 {
@@ -73,7 +90,7 @@ exports[`ArrayObjectTable matches snapshot 1`] = `
   skipEmptyRows={true}
   title={null}
 >
-  <Table
+  <Styled(Table)
     flexibleColumns={false}
     nameByRow={false}
     names={Array []}
@@ -95,78 +112,103 @@ exports[`ArrayObjectTable matches snapshot 1`] = `
       ]
     }
   >
-    <TableContainer
+    <Table
+      className="emotion-14"
       flexibleColumns={false}
+      nameByRow={false}
+      names={Array []}
+      rowIncludesHeading={false}
+      rows={
+        Array [
+          Array [
+            "test",
+            "two",
+            "-",
+          ],
+        ]
+      }
+      titles={
+        Array [
+          "One",
+          "Two",
+          "Three",
+        ]
+      }
     >
-      <table
-        className="emotion-12 emotion-13"
+      <TableContainer
+        className="emotion-14"
+        flexibleColumns={false}
       >
-        <thead>
-          <tr>
-            <TableHeading
-              key="0"
-            >
-              <th
-                className="emotion-0 emotion-1"
+        <table
+          className="emotion-12 emotion-13"
+        >
+          <thead>
+            <tr>
+              <TableHeading
+                key="0"
               >
-                One
-              </th>
-            </TableHeading>
-            <TableHeading
-              key="1"
-            >
-              <th
-                className="emotion-0 emotion-1"
+                <th
+                  className="emotion-0 emotion-1"
+                >
+                  One
+                </th>
+              </TableHeading>
+              <TableHeading
+                key="1"
               >
-                Two
-              </th>
-            </TableHeading>
-            <TableHeading
-              key="2"
-            >
-              <th
-                className="emotion-0 emotion-1"
+                <th
+                  className="emotion-0 emotion-1"
+                >
+                  Two
+                </th>
+              </TableHeading>
+              <TableHeading
+                key="2"
               >
-                Three
-              </th>
-            </TableHeading>
-          </tr>
-        </thead>
-        <tbody>
-          <tr
-            key="0"
-          >
-            <TableData
+                <th
+                  className="emotion-0 emotion-1"
+                >
+                  Three
+                </th>
+              </TableHeading>
+            </tr>
+          </thead>
+          <tbody>
+            <tr
               key="0"
             >
-              <td
-                className="emotion-6 emotion-7"
+              <TableData
+                key="0"
               >
-                test
-              </td>
-            </TableData>
-            <TableData
-              key="1"
-            >
-              <td
-                className="emotion-6 emotion-7"
+                <td
+                  className="emotion-6 emotion-7"
+                >
+                  test
+                </td>
+              </TableData>
+              <TableData
+                key="1"
               >
-                two
-              </td>
-            </TableData>
-            <TableData
-              key="2"
-            >
-              <td
-                className="emotion-6 emotion-7"
+                <td
+                  className="emotion-6 emotion-7"
+                >
+                  two
+                </td>
+              </TableData>
+              <TableData
+                key="2"
               >
-                -
-              </td>
-            </TableData>
-          </tr>
-        </tbody>
-      </table>
-    </TableContainer>
-  </Table>
+                <td
+                  className="emotion-6 emotion-7"
+                >
+                  -
+                </td>
+              </TableData>
+            </tr>
+          </tbody>
+        </table>
+      </TableContainer>
+    </Table>
+  </Styled(Table)>
 </ArrayObjectTable>
 `;
diff --git a/components/array-object-table/src/test.js b/components/array-object-table/src/test.js
index 768d735..b9aa6ae 100644
--- a/components/array-object-table/src/test.js
+++ b/components/array-object-table/src/test.js
@@ -24,13 +24,13 @@ describe('ArrayObjectTable', () => {
 
   describe('renders table data', () => {
     it('renders expected table heading cells ', () => {
-      const wrapper = shallow(<ArrayObjectTable fields={fields} array={array} />);
+      const wrapper = mount(<ArrayObjectTable fields={fields} array={array} />);
       const titles = wrapper.find('Table').prop('titles');
       expect(titles).toEqual(['One', 'Two', 'Three']);
     });
 
     it('renders expected table data cells', () => {
-      const wrapper = shallow(<ArrayObjectTable fields={fields} array={array} />);
+      const wrapper = mount(<ArrayObjectTable fields={fields} array={array} />);
       expect(getRows(wrapper)).toEqual([['-', 'two', '-'], ['test', 'two', '-']]);
     });
   });
diff --git a/components/object-table/src/__snapshots__/test.js.snap b/components/object-table/src/__snapshots__/test.js.snap
index f105f00..dfd1d7b 100644
--- a/components/object-table/src/__snapshots__/test.js.snap
+++ b/components/object-table/src/__snapshots__/test.js.snap
@@ -1,11 +1,28 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ObjectTable matches snapshot 1`] = `
+.emotion-10 {
+  margin-bottom: 15px;
+}
+
+@media only screen and (min-width:641px) {
+  .emotion-10 {
+    margin-bottom: 15px;
+  }
+}
+
 .emotion-8 {
   display: table;
   font-family: "nta",Arial,sans-serif;
   width: 100%;
   table-layout: fixed;
+  margin-bottom: 15px;
+}
+
+@media only screen and (min-width:641px) {
+  .emotion-8 {
+    margin-bottom: 15px;
+  }
 }
 
 .emotion-0 {
@@ -67,7 +84,7 @@ exports[`ObjectTable matches snapshot 1`] = `
   skipEmptyValues={false}
   title={null}
 >
-  <Table
+  <Styled(Table)
     flexibleColumns={false}
     nameByRow={true}
     names={
@@ -91,72 +108,99 @@ exports[`ObjectTable matches snapshot 1`] = `
     }
     titles={null}
   >
-    <TableContainer
+    <Table
+      className="emotion-10"
       flexibleColumns={false}
+      nameByRow={true}
+      names={
+        Array [
+          "one",
+          "two",
+        ]
+      }
+      rowIncludesHeading={true}
+      rows={
+        Array [
+          Array [
+            "One",
+            "test",
+          ],
+          Array [
+            "Two",
+            "two",
+          ],
+        ]
+      }
+      titles={null}
     >
-      <table
-        className="emotion-8 emotion-9"
+      <TableContainer
+        className="emotion-10"
+        flexibleColumns={false}
       >
-        <tbody>
-          <tr
-            key="0"
-          >
-            <TableHeading
-              columnCount={2}
+        <table
+          className="emotion-8 emotion-9"
+        >
+          <tbody>
+            <tr
               key="0"
-              name="one"
-              rowHeading={true}
             >
-              <th
-                className="emotion-0 emotion-1"
+              <TableHeading
+                columnCount={2}
+                key="0"
                 name="one"
+                rowHeading={true}
               >
-                One
-              </th>
-            </TableHeading>
-            <TableData
-              key="1"
-              name="one"
-            >
-              <td
-                className="emotion-2 emotion-3"
+                <th
+                  className="emotion-0 emotion-1"
+                  name="one"
+                >
+                  One
+                </th>
+              </TableHeading>
+              <TableData
+                key="1"
                 name="one"
               >
-                test
-              </td>
-            </TableData>
-          </tr>
-          <tr
-            key="1"
-          >
-            <TableHeading
-              columnCount={2}
-              key="0"
-              name="two"
-              rowHeading={true}
+                <td
+                  className="emotion-2 emotion-3"
+                  name="one"
+                >
+                  test
+                </td>
+              </TableData>
+            </tr>
+            <tr
+              key="1"
             >
-              <th
-                className="emotion-0 emotion-1"
+              <TableHeading
+                columnCount={2}
+                key="0"
                 name="two"
+                rowHeading={true}
               >
-                Two
-              </th>
-            </TableHeading>
-            <TableData
-              key="1"
-              name="two"
-            >
-              <td
-                className="emotion-2 emotion-3"
+                <th
+                  className="emotion-0 emotion-1"
+                  name="two"
+                >
+                  Two
+                </th>
+              </TableHeading>
+              <TableData
+                key="1"
                 name="two"
               >
-                two
-              </td>
-            </TableData>
-          </tr>
-        </tbody>
-      </table>
-    </TableContainer>
-  </Table>
+                <td
+                  className="emotion-2 emotion-3"
+                  name="two"
+                >
+                  two
+                </td>
+              </TableData>
+            </tr>
+          </tbody>
+        </table>
+      </TableContainer>
+    </Table>
+  </Styled(Table)>
 </ObjectTable>
 `;
diff --git a/package.json b/package.json
index ea29713..b20ddad 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
       "!<rootDir>/packages/storybook/**",
       "!<rootDir>/packages/api-docs/**"
     ],
-    "testURL": "http://localhost",
     "setupTestFrameworkScriptFile": "<rootDir>/scripts/setupTests.js",
     "testMatch": [
       "<rootDir>/{components,packages}/*/src/**/?(*.)(spec|test).js?(x)"
diff --git a/yarn.lock b/yarn.lock
index 0410c9a..2cc94cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -947,6 +947,16 @@
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.1.tgz#f3a81587ad8d0ef33cdad6f3b4310774fcc1053e"
 
+"@govuk-frederic/arrow@^0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@govuk-frederic/arrow/-/arrow-0.0.2.tgz#90fe79962f8b7bfbffe3dded8eb3c6499309d05d"
+
+"@govuk-frederic/open-button@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@govuk-frederic/open-button/-/open-button-0.0.3.tgz#15a8d4e31468c71fb8475bc27a42d24a79a05c4d"
+  dependencies:
+    "@govuk-frederic/arrow" "^0.0.2"
+
 "@govuk-react/back-link@^0.2.9":
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/@govuk-react/back-link/-/back-link-0.2.9.tgz#ec4b1126f7f78567a25915c40e8d76f3abb6ba33"
@@ -980,7 +990,7 @@
     "@govuk-react/hoc" "^0.2.7"
     govuk-colours "^1.0.3"
 
-"@govuk-react/constants@^0.2.2", "@govuk-react/constants@^0.2.7":
+"@govuk-react/constants@^0.2.7":
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/@govuk-react/constants/-/constants-0.2.7.tgz#0be54d90a352dde8a96a82a20b6fe778b05807f1"
   dependencies:
@@ -1731,7 +1741,7 @@ ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
@@ -2068,7 +2078,7 @@ aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@^1.6.0:
+aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
@@ -3875,7 +3885,7 @@ columnify@^1.5.4:
     strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@1.0.6, combined-stream@~1.0.5:
+combined-stream@1.0.6, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
@@ -5547,7 +5557,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@~3.0.1:
+extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
@@ -5847,7 +5857,7 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~2.3.1:
+form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
   dependencies:
@@ -6406,11 +6416,11 @@ har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
 
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+har-validator@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
   dependencies:
-    ajv "^5.1.0"
+    ajv "^5.3.0"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
@@ -8612,7 +8622,7 @@ mime-db@~1.35.0:
   version "1.35.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18:
+mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.19"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0"
   dependencies:
@@ -8688,8 +8698,8 @@ minimist@~0.0.1, minimist@~0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
 minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -9050,8 +9060,8 @@ normalize.css@^8.0.0:
   resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.0.tgz#14ac5e461612538a4ce9be90a7da23f86e718493"
 
 npm-bundled@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.4.tgz#81ee67cb61f13f6f2dabe6728283ee35a5821829"
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
 
 npm-packlist@^1.1.6:
   version "1.1.11"
@@ -9104,9 +9114,9 @@ nwsapi@^2.0.7:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.8.tgz#e3603579b7e162b3dbedae4fb24e46f771d8fa24"
 
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
 
 object-assign@^3.0.0:
   version "3.0.0"
@@ -10141,7 +10151,7 @@ qs@6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
-qs@^6.5.1, qs@~6.5.1:
+qs@^6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
@@ -10859,29 +10869,29 @@ request-promise-native@^1.0.5:
     tough-cookie ">=2.3.3"
 
 request@^2.65.0, request@^2.87.0:
-  version "2.87.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   dependencies:
     aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
+    aws4 "^1.8.0"
     caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
     forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
     performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    tough-cookie "~2.3.3"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
     tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
+    uuid "^3.3.2"
 
 require-directory@^2.1.1:
   version "2.1.1"
@@ -11939,19 +11949,13 @@ touch@^1.0.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.4:
+tough-cookie@>=2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  dependencies:
-    punycode "^1.4.1"
-
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -12267,7 +12271,7 @@ uuid@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1:
+uuid@^3.0.1, uuid@^3.2.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"