diff --git a/packages/xpub-ui/package.json b/packages/xpub-ui/package.json
index bbef0a729f289045f80b2894c91c9bceb691fd75..775ca60a7b3e5e061e22482b2131432a6f8d7e6d 100644
--- a/packages/xpub-ui/package.json
+++ b/packages/xpub-ui/package.json
@@ -30,7 +30,7 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
     "css-loader": "^0.28.4",
-    "enzyme": "^3.1.0",
+    "enzyme": "^2.9.1",
     "faker": "^4.1.0",
     "file-loader": "^1.1.5",
     "jest": "^21.2.1",
diff --git a/packages/xpub-ui/test/AppBar.test.js b/packages/xpub-ui/test/AppBar.test.js
index ce92d01be9567d2bfa8532c107ec50eeb963046d..9a94b13fc8f8948367fbf16a708f59b0d91eb96a 100644
--- a/packages/xpub-ui/test/AppBar.test.js
+++ b/packages/xpub-ui/test/AppBar.test.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { clone } from 'lodash'
 import { shallow } from 'enzyme'
-import { Link } from 'react-router-dom'
+import {Link, MemoryRouter} from 'react-router-dom'
 import renderer from 'react-test-renderer'
 
 import AppBar from '../src/molecules/AppBar'
@@ -14,50 +14,39 @@ const props = {
   userName: 'some name',
 }
 
-const wrapper = shallow(<AppBar {...props} />)
+function makeWrapper(extraProps = {}) {
+  return shallow(
+      <MemoryRouter>
+        <AppBar {...props} {...extraProps}/>
+      </MemoryRouter>
+  ).dive().dive()
+}
 
 describe('AppBar', () => {
   test('Snapshot', () => {
     const tree = renderer.create(
-      <AppBar {...props} />
+        <MemoryRouter>
+          <AppBar {...props} />
+        </MemoryRouter>
     ).toJSON()
     expect(tree).toMatchSnapshot()
   })
 
-  test('Should render correctly', () => {
-    expect(wrapper.is('div'))
-    expect(wrapper.children()).toHaveLength(2)
-
-    const brand = wrapper.childAt(0)
-    expect(brand.is(Link)).toBeTruthy()
-    expect(brand.children()).toHaveLength(1)
-
-    const rightArea = wrapper.childAt(1)
-    expect(rightArea.is('div')).toBeTruthy()
-    expect(rightArea.children()).toHaveLength(2)
-
-    const username = rightArea.childAt(0)
-    expect(username.is('span')).toBeTruthy()
-
-    const logLink = rightArea.childAt(1)
-    expect(logLink.is(Link)).toBeTruthy()
-  })
-
-  test('Should link the brand to \'/\' if no brand link is given', () => {
-    const newProps = clone(props)
-    newProps.brandLink = undefined
-    const wrapper = shallow(<AppBar {...newProps} />)
+  test("Should link the brand to '/' if no brand link is given", () => {
+    const wrapper = makeWrapper({brandLink: undefined})
 
     const brand = wrapper.childAt(0)
     expect(brand.prop('to')).toBe('/')
   })
 
   test('Should link the brand to the given prop', () => {
+    const wrapper = makeWrapper()
     const brand = wrapper.childAt(0)
     expect(brand.prop('to')).toBe(props.brandLink)
   })
 
   test('Should display the brand name', () => {
+    const wrapper = makeWrapper()
     const brand = wrapper.childAt(0)
     const brandName = brand.childAt(0)
 
@@ -65,9 +54,7 @@ describe('AppBar', () => {
   })
 
   test('Should not display the username if there is none given', () => {
-    const newProps = clone(props)
-    newProps.userName = undefined
-    const wrapper = shallow(<AppBar {...newProps} />)
+    const wrapper = makeWrapper({userName: undefined})
 
     const rightArea = wrapper.childAt(1)
 
@@ -76,6 +63,7 @@ describe('AppBar', () => {
   })
 
   test('Should display the username', () => {
+    const wrapper = makeWrapper()
     const rightArea = wrapper.childAt(1)
     expect(rightArea.children()).toHaveLength(2)
 
@@ -84,9 +72,7 @@ describe('AppBar', () => {
   })
 
   test('Should display the login link if no username is given', () => {
-    const newProps = clone(props)
-    newProps.userName = undefined
-    const wrapper = shallow(<AppBar {...newProps} />)
+    const wrapper = makeWrapper({userName: undefined})
 
     const rightArea = wrapper.childAt(1)
     const logLink = rightArea.childAt(0)  // first el if there is no username
@@ -100,6 +86,7 @@ describe('AppBar', () => {
   })
 
   test('Should display the logout link if a username is found', () => {
+    const wrapper = makeWrapper()
     const rightArea = wrapper.childAt(1)
     const logLink = rightArea.childAt(1) // 2nd el if there is a username
 
diff --git a/packages/xpub-ui/test/Radio.test.js b/packages/xpub-ui/test/Radio.test.js
index ceae22df240e1783ccb2c0658f4936e078992320..cadded1ba8caad7c98172b80bc5483077b591128 100644
--- a/packages/xpub-ui/test/Radio.test.js
+++ b/packages/xpub-ui/test/Radio.test.js
@@ -22,19 +22,6 @@ describe('Radio', () => {
     expect(tree).toMatchSnapshot()
   })
 
-  test('Renders correctly', () => {
-    expect(wrapper.is('label')).toBeTruthy()
-    expect(wrapper.children()).toHaveLength(2)
-
-    const input = wrapper.childAt(0)
-    expect(input.is('input')).toBeTruthy()
-    expect(input.children()).toHaveLength(0)
-
-    const labelSpan = wrapper.childAt(1)
-    expect(labelSpan.text()).toBe(props.label)
-    expect(labelSpan.children()).toHaveLength(1)
-  })
-
   test('Input gets the correct props', () => {
     const input = wrapper.find('input')
 
diff --git a/packages/xpub-ui/test/__snapshots__/AppBar.test.js.snap b/packages/xpub-ui/test/__snapshots__/AppBar.test.js.snap
index 456909a198402833ec60fb07962c084c4ad62692..0a98c2a9a875d89b895be2ae178d10f5c0fe5d57 100644
--- a/packages/xpub-ui/test/__snapshots__/AppBar.test.js.snap
+++ b/packages/xpub-ui/test/__snapshots__/AppBar.test.js.snap
@@ -6,8 +6,8 @@ exports[`AppBar Snapshot 1`] = `
 >
   <a
     className=""
+    href="some link"
     onClick={[Function]}
-    style={Object {}}
   >
     some brand
   </a>
@@ -15,7 +15,9 @@ exports[`AppBar Snapshot 1`] = `
     <span
       className={undefined}
     >
-      <span>
+      <span
+        className={undefined}
+      >
         <svg
           height={16}
           viewBox="0 0 24 24"
@@ -50,8 +52,8 @@ exports[`AppBar Snapshot 1`] = `
     </span>
     <a
       className=""
+      href="logout link"
       onClick={[Function]}
-      style={Object {}}
     >
       logout
     </a>
diff --git a/packages/xpub-ui/test/__snapshots__/Menu.test.js.snap b/packages/xpub-ui/test/__snapshots__/Menu.test.js.snap
index 0d6d7d32193a6a59ba062d7313884f2c25001d81..1a24b603fff55fa8827b090c8f73e3fc81e52630 100644
--- a/packages/xpub-ui/test/__snapshots__/Menu.test.js.snap
+++ b/packages/xpub-ui/test/__snapshots__/Menu.test.js.snap
@@ -7,23 +7,27 @@ exports[`Menu Snapshot 1`] = `
   <div
     className={undefined}
   >
-    <button
+    <div
       className={undefined}
-      onClick={[Function]}
-      type="button"
     >
-      <span>
-        Foo
-      </span>
-      <span
+      <button
         className={undefined}
+        onClick={[Function]}
+        type="button"
       >
-        â–¼
-      </span>
-    </button>
+        <span>
+          Foo
+        </span>
+        <span
+          className={undefined}
+        >
+          â–¼
+        </span>
+      </button>
+    </div>
+    <div
+      className={undefined}
+    />
   </div>
-  <div
-    className={undefined}
-  />
 </div>
 `;
diff --git a/packages/xpub-ui/test/__snapshots__/Radio.test.js.snap b/packages/xpub-ui/test/__snapshots__/Radio.test.js.snap
index 22221e98a81999c5110a0454a82e70c78d6b54f9..a625cdb63351e1089dabf79345d35fde2e6ad2d5 100644
--- a/packages/xpub-ui/test/__snapshots__/Radio.test.js.snap
+++ b/packages/xpub-ui/test/__snapshots__/Radio.test.js.snap
@@ -5,7 +5,7 @@ exports[`Radio Snapshot 1`] = `
   className=""
   style={
     Object {
-      "color": undefined,
+      "color": "black",
     }
   }
 >
@@ -18,6 +18,16 @@ exports[`Radio Snapshot 1`] = `
     type="radio"
     value="TestValue"
   />
+  <span
+    className={undefined}
+    style={
+      Object {
+        "background": "transparent",
+      }
+    }
+  >
+     
+  </span>
   <span
     className={undefined}
   >
diff --git a/packages/xpub-ui/test/__snapshots__/RadioGroup.test.js.snap b/packages/xpub-ui/test/__snapshots__/RadioGroup.test.js.snap
index 7060ef82c0a7cf3f46dc178940cdcc45388a247c..a76a41da236e7d1ed319c1a14e9f8eebfb941998 100644
--- a/packages/xpub-ui/test/__snapshots__/RadioGroup.test.js.snap
+++ b/packages/xpub-ui/test/__snapshots__/RadioGroup.test.js.snap
@@ -6,7 +6,7 @@ exports[`Radio Group Snapshot 1`] = `
     className=""
     style={
       Object {
-        "color": undefined,
+        "color": "black",
       }
     }
   >
@@ -19,6 +19,16 @@ exports[`Radio Group Snapshot 1`] = `
       type="radio"
       value="yes"
     />
+    <span
+      className={undefined}
+      style={
+        Object {
+          "background": "transparent",
+        }
+      }
+    >
+       
+    </span>
     <span
       className={undefined}
     >
@@ -29,7 +39,7 @@ exports[`Radio Group Snapshot 1`] = `
     className=""
     style={
       Object {
-        "color": undefined,
+        "color": "black",
       }
     }
   >
@@ -42,6 +52,16 @@ exports[`Radio Group Snapshot 1`] = `
       type="radio"
       value="no"
     />
+    <span
+      className={undefined}
+      style={
+        Object {
+          "background": "transparent",
+        }
+      }
+    >
+       
+    </span>
     <span
       className={undefined}
     >
@@ -52,7 +72,7 @@ exports[`Radio Group Snapshot 1`] = `
     className=""
     style={
       Object {
-        "color": undefined,
+        "color": "black",
       }
     }
   >
@@ -65,6 +85,16 @@ exports[`Radio Group Snapshot 1`] = `
       type="radio"
       value="maybe"
     />
+    <span
+      className={undefined}
+      style={
+        Object {
+          "background": "transparent",
+        }
+      }
+    >
+       
+    </span>
     <span
       className={undefined}
     >
diff --git a/packages/xpub-ui/test/__snapshots__/YesOrNo.test.js.snap b/packages/xpub-ui/test/__snapshots__/YesOrNo.test.js.snap
index 11ea90396ab9bf1f32299ddf600de8691e8f4340..b301578a5fe1d428a877067a4c0873551b5019b5 100644
--- a/packages/xpub-ui/test/__snapshots__/YesOrNo.test.js.snap
+++ b/packages/xpub-ui/test/__snapshots__/YesOrNo.test.js.snap
@@ -6,7 +6,7 @@ exports[`Yes or No Snapshot 1`] = `
     className=""
     style={
       Object {
-        "color": undefined,
+        "color": "black",
       }
     }
   >
@@ -19,6 +19,16 @@ exports[`Yes or No Snapshot 1`] = `
       type="radio"
       value="yes"
     />
+    <span
+      className={undefined}
+      style={
+        Object {
+          "background": "transparent",
+        }
+      }
+    >
+       
+    </span>
     <span
       className={undefined}
     >
@@ -29,7 +39,7 @@ exports[`Yes or No Snapshot 1`] = `
     className=""
     style={
       Object {
-        "color": undefined,
+        "color": "black",
       }
     }
   >
@@ -42,6 +52,16 @@ exports[`Yes or No Snapshot 1`] = `
       type="radio"
       value="no"
     />
+    <span
+      className={undefined}
+      style={
+        Object {
+          "background": "transparent",
+        }
+      }
+    >
+       
+    </span>
     <span
       className={undefined}
     >
diff --git a/yarn.lock b/yarn.lock
index ae60547f40427d482c570d82f86a101896edf8ab..fe072386fbacffde545881f04671247daf7fd277 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1675,16 +1675,26 @@ character-reference-invalid@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz#942835f750e4ec61a308e60c2ef8cc1011202efc"
 
-cheerio@^1.0.0-rc.2:
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
+cheerio@^0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
   dependencies:
     css-select "~1.2.0"
     dom-serializer "~0.1.0"
     entities "~1.1.1"
     htmlparser2 "^3.9.1"
-    lodash "^4.15.0"
-    parse5 "^3.0.1"
+    lodash.assignin "^4.0.9"
+    lodash.bind "^4.1.4"
+    lodash.defaults "^4.0.1"
+    lodash.filter "^4.4.0"
+    lodash.flatten "^4.2.0"
+    lodash.foreach "^4.3.0"
+    lodash.map "^4.4.0"
+    lodash.merge "^4.4.0"
+    lodash.pick "^4.2.1"
+    lodash.reduce "^4.4.0"
+    lodash.reject "^4.4.0"
+    lodash.some "^4.4.0"
 
 chokidar@^1.0.1, chokidar@^1.6.0, chokidar@^1.7.0:
   version "1.7.0"
@@ -1888,10 +1898,6 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
-colors@0.5.x:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
-
 colors@0.6.x, colors@0.x.x, colors@~0.6.0-1:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
@@ -2684,10 +2690,6 @@ direction@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/direction/-/direction-0.1.5.tgz#ce5d797f97e26f8be7beff53f7dc40e1c1a9ec4c"
 
-discontinuous-range@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
-
 dlv@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.0.tgz#fee1a7c43f63be75f3f679e85262da5f102764a7"
@@ -2917,21 +2919,20 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-enzyme@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.2.0.tgz#998bdcda0fc71b8764a0017f7cc692c943f54a7a"
+enzyme@^2.9.1:
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.9.1.tgz#07d5ce691241240fb817bf2c4b18d6e530240df6"
   dependencies:
-    cheerio "^1.0.0-rc.2"
-    function.prototype.name "^1.0.3"
-    has "^1.0.1"
+    cheerio "^0.22.0"
+    function.prototype.name "^1.0.0"
     is-subset "^0.1.1"
     lodash "^4.17.4"
     object-is "^1.0.1"
     object.assign "^4.0.4"
     object.entries "^1.0.4"
     object.values "^1.0.4"
-    raf "^3.4.0"
-    rst-selector-parser "^2.2.3"
+    prop-types "^15.5.10"
+    uuid "^3.0.1"
 
 err-code@^1.0.0:
   version "1.1.2"
@@ -3748,7 +3749,7 @@ function.name-polyfill@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/function.name-polyfill/-/function.name-polyfill-1.0.5.tgz#d349bb4e24a324f08120455ee78a04142b1257bb"
 
-function.prototype.name@^1.0.3:
+function.prototype.name@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.3.tgz#0099ae5572e9dd6f03c97d023fd92bcc5e639eac"
   dependencies:
@@ -5841,6 +5842,14 @@ lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
 
+lodash.assignin@^4.0.9:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+
+lodash.bind@^4.1.4:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -5853,9 +5862,21 @@ lodash.cond@^4.3.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
 
-lodash.flattendeep@^4.4.0:
+lodash.defaults@^4.0.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+
+lodash.filter@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
+
+lodash.flatten@^4.2.0:
   version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+
+lodash.foreach@^4.3.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
 
 lodash.get@^4.4.2:
   version "4.4.2"
@@ -5865,10 +5886,18 @@ lodash.isnull@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash.isnull/-/lodash.isnull-3.0.0.tgz#fafbe59ea1dca27eed786534039dd84c2e07c56e"
 
+lodash.map@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
+
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
+lodash.merge@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
+
 lodash.mergewith@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
@@ -5889,10 +5918,22 @@ lodash.padstart@^4.1.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"
 
-lodash.reduce@4.6.0:
+lodash.pick@^4.2.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+
+lodash.reduce@4.6.0, lodash.reduce@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
 
+lodash.reject@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
+
+lodash.some@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
+
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -6345,14 +6386,6 @@ ncp@1.0.x:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-1.0.1.tgz#d15367e5cb87432ba117d2bf80fdf45aecfb4246"
 
-nearley@^2.7.10:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.11.0.tgz#5e626c79a6cd2f6ab9e7e5d5805e7668967757ae"
-  dependencies:
-    nomnom "~1.6.2"
-    railroad-diagrams "^1.0.0"
-    randexp "^0.4.2"
-
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@@ -6515,13 +6548,6 @@ node-sass@^4.5.3:
     sass-graph "^2.2.4"
     stdout-stream "^1.4.0"
 
-nomnom@~1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"
-  dependencies:
-    colors "0.5.x"
-    underscore "~1.4.4"
-
 noop-logger@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
@@ -6937,11 +6963,11 @@ parse5@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
 
-parse5@^3.0.1, parse5@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+parse5@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
   dependencies:
-    "@types/node" "*"
+    "@types/node" "^6.0.46"
 
 parseurl@~1.3.2:
   version "1.3.2"
@@ -8034,23 +8060,6 @@ querystringify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
 
-raf@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
-  dependencies:
-    performance-now "^2.1.0"
-
-railroad-diagrams@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
-
-randexp@^0.4.2:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
-  dependencies:
-    discontinuous-range "1.0.0"
-    ret "~0.1.10"
-
 randomatic@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@@ -8974,10 +8983,6 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
@@ -9009,13 +9014,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
-rst-selector-parser@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
-  dependencies:
-    lodash.flattendeep "^4.4.0"
-    nearley "^2.7.10"
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -10252,10 +10250,6 @@ uncontrollable@^4.1.0:
   dependencies:
     invariant "^2.1.0"
 
-underscore@~1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
-
 unherit@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d"