diff --git a/package.json b/package.json
index e4153d55d..a0e959c2f 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "passport-facebook": "^2.1.1",
     "passport-local": "^1.0.0",
     "react-apollo": "^0.10.0",
+    "react-dom": "^15.4.2",
     "react-recaptcha": "^2.2.6",
     "redis": "^2.6.5",
     "uuid": "^2.0.3"
@@ -150,15 +151,13 @@
     "precss": "^1.4.0",
     "pym.js": "^1.1.1",
     "react": "next",
-    "react-addons-test-utils": "15.3.2",
-    "react-dom": "next",
     "react-highlight-words": "^0.6.0",
     "react-linkify": "^0.1.3",
     "react-mdl": "^1.7.2",
     "react-mdl-selectfield": "^0.2.0",
     "react-onclickoutside": "^5.7.1",
     "react-redux": "^4.4.5",
-    "react-router": "^3.0.0",
+    "react-router": "next",
     "react-tagsinput": "^3.14.0",
     "redux": "^3.6.0",
     "redux-mock-store": "^1.2.1",
diff --git a/test/mocha.opts b/test/mocha.opts
index a159ae7aa..36be84461 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,5 +1,7 @@
 test/helpers/*.js
-test
+
+test/e2e
+test/server
 --compilers js:babel-core/register
 --require ignore-styles
 --recursive
diff --git a/test/graph/context.js b/test/server/graph/context.js
similarity index 91%
rename from test/graph/context.js
rename to test/server/graph/context.js
index 413622678..b01917289 100644
--- a/test/graph/context.js
+++ b/test/server/graph/context.js
@@ -1,8 +1,8 @@
 const expect = require('chai').expect;
 
-const User = require('../../models/user');
-const Context = require('../../graph/context');
-const errors = require('../../errors');
+const User = require('../../../models/user');
+const Context = require('../../../graph/context');
+const errors = require('../../../errors');
 
 describe('graph.Context', () => {
 
diff --git a/test/graph/loaders/metrics.js b/test/server/graph/loaders/metrics.js
similarity index 92%
rename from test/graph/loaders/metrics.js
rename to test/server/graph/loaders/metrics.js
index 29f2eeff1..f095e201f 100644
--- a/test/graph/loaders/metrics.js
+++ b/test/server/graph/loaders/metrics.js
@@ -1,13 +1,13 @@
 const {expect} = require('chai');
 const {graphql} = require('graphql');
 
-const schema = require('../../../graph/schema');
-const Context = require('../../../graph/context');
-const UserModel = require('../../../models/user');
-const AssetModel = require('../../../models/asset');
-const SettingsService = require('../../../services/settings');
-const ActionModel = require('../../../models/action');
-const CommentModel = require('../../../models/comment');
+const schema = require('../../../../graph/schema');
+const Context = require('../../../../graph/context');
+const UserModel = require('../../../../models/user');
+const AssetModel = require('../../../../models/asset');
+const SettingsService = require('../../../../services/settings');
+const ActionModel = require('../../../../models/action');
+const CommentModel = require('../../../../models/comment');
 
 describe('graph.loaders.Metrics', () => {
   beforeEach(() => SettingsService.init());
diff --git a/test/graph/mutations/addCommentTag.js b/test/server/graph/mutations/addCommentTag.js
similarity index 86%
rename from test/graph/mutations/addCommentTag.js
rename to test/server/graph/mutations/addCommentTag.js
index 0835e81bc..018e96631 100644
--- a/test/graph/mutations/addCommentTag.js
+++ b/test/server/graph/mutations/addCommentTag.js
@@ -1,11 +1,11 @@
 const expect = require('chai').expect;
 const {graphql} = require('graphql');
 
-const schema = require('../../../graph/schema');
-const Context = require('../../../graph/context');
-const UserModel = require('../../../models/user');
-const SettingsService = require('../../../services/settings');
-const CommentsService = require('../../../services/comments');
+const schema = require('../../../../graph/schema');
+const Context = require('../../../../graph/context');
+const UserModel = require('../../../../models/user');
+const SettingsService = require('../../../../services/settings');
+const CommentsService = require('../../../../services/comments');
 
 describe('graph.mutations.addCommentTag', () => {
   let comment;
diff --git a/test/graph/mutations/createComment.js b/test/server/graph/mutations/createComment.js
similarity index 95%
rename from test/graph/mutations/createComment.js
rename to test/server/graph/mutations/createComment.js
index 26775933c..b3bdd459a 100644
--- a/test/graph/mutations/createComment.js
+++ b/test/server/graph/mutations/createComment.js
@@ -1,12 +1,12 @@
 const expect = require('chai').expect;
 const {graphql} = require('graphql');
 
-const schema = require('../../../graph/schema');
-const Context = require('../../../graph/context');
-const UserModel = require('../../../models/user');
-const AssetModel = require('../../../models/asset');
-const SettingsService = require('../../../services/settings');
-const ActionModel = require('../../../models/action');
+const schema = require('../../../../graph/schema');
+const Context = require('../../../../graph/context');
+const UserModel = require('../../../../models/user');
+const AssetModel = require('../../../../models/asset');
+const SettingsService = require('../../../../services/settings');
+const ActionModel = require('../../../../models/action');
 
 describe('graph.mutations.createComment', () => {
   beforeEach(() => SettingsService.init());
diff --git a/test/graph/mutations/removeCommentTag.js b/test/server/graph/mutations/removeCommentTag.js
similarity index 87%
rename from test/graph/mutations/removeCommentTag.js
rename to test/server/graph/mutations/removeCommentTag.js
index 99def095d..c0d452f37 100644
--- a/test/graph/mutations/removeCommentTag.js
+++ b/test/server/graph/mutations/removeCommentTag.js
@@ -1,11 +1,11 @@
 const expect = require('chai').expect;
 const {graphql} = require('graphql');
 
-const schema = require('../../../graph/schema');
-const Context = require('../../../graph/context');
-const UserModel = require('../../../models/user');
-const SettingsService = require('../../../services/settings');
-const CommentsService = require('../../../services/comments');
+const schema = require('../../../../graph/schema');
+const Context = require('../../../../graph/context');
+const UserModel = require('../../../../models/user');
+const SettingsService = require('../../../../services/settings');
+const CommentsService = require('../../../../services/comments');
 
 describe('graph.mutations.removeCommentTag', () => {
   let comment;
diff --git a/test/kue.js b/test/server/kue.js
similarity index 73%
rename from test/kue.js
rename to test/server/kue.js
index 504760b82..8bdc9b398 100644
--- a/test/kue.js
+++ b/test/server/kue.js
@@ -1,4 +1,4 @@
-const kue = require('../services/kue');
+const kue = require('../../services/kue');
 
 beforeEach(() => {
 
diff --git a/test/mongoose.js b/test/server/mongoose.js
similarity index 80%
rename from test/mongoose.js
rename to test/server/mongoose.js
index 6fac193fa..a1bac6150 100644
--- a/test/mongoose.js
+++ b/test/server/mongoose.js
@@ -1,4 +1,4 @@
-const mongoose = require('./helpers/mongoose');
+const mongoose = require('../helpers/mongoose');
 
 before(function(done) {
   this.timeout(30000);
diff --git a/test/passport.js b/test/server/passport.js
similarity index 90%
rename from test/passport.js
rename to test/server/passport.js
index 2d1c53ab9..401e50b77 100644
--- a/test/passport.js
+++ b/test/server/passport.js
@@ -1,4 +1,4 @@
-const authorization = require('../middleware/authorization');
+const authorization = require('../../middleware/authorization');
 
 // Add the passport middleware here before it's setup.
 authorization.middleware.push((req, res, next) => {
diff --git a/test/routes/api/account/index.js b/test/server/routes/api/account/index.js
similarity index 92%
rename from test/routes/api/account/index.js
rename to test/server/routes/api/account/index.js
index 3a4493279..67744f9bc 100644
--- a/test/routes/api/account/index.js
+++ b/test/server/routes/api/account/index.js
@@ -1,17 +1,17 @@
 const passport = require('../../../passport');
 
-const app = require('../../../../app');
+const app = require('../../../../../app');
 const chai = require('chai');
 const expect = chai.expect;
 
-const SettingsService = require('../../../../services/settings');
+const SettingsService = require('../../../../../services/settings');
 const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
 // Setup chai.
 chai.should();
 chai.use(require('chai-http'));
 
-const UsersService = require('../../../../services/users');
+const UsersService = require('../../../../../services/users');
 
 describe('/api/v1/account/username', () => {
   let mockUser;
diff --git a/test/routes/api/assets/index.js b/test/server/routes/api/assets/index.js
similarity index 94%
rename from test/routes/api/assets/index.js
rename to test/server/routes/api/assets/index.js
index 9f1e4ad66..80708688b 100644
--- a/test/routes/api/assets/index.js
+++ b/test/server/routes/api/assets/index.js
@@ -1,6 +1,6 @@
 const passport = require('../../../passport');
 
-const app = require('../../../../app');
+const app = require('../../../../../app');
 const chai = require('chai');
 const expect = chai.expect;
 
@@ -8,9 +8,9 @@ const expect = chai.expect;
 chai.should();
 chai.use(require('chai-http'));
 
-const AssetModel = require('../../../../models/asset');
-const AssetsService = require('../../../../services/assets');
-const SettingsService = require('../../../../services/settings');
+const AssetModel = require('../../../../../models/asset');
+const AssetsService = require('../../../../../services/assets');
+const SettingsService = require('../../../../../services/settings');
 
 describe('/api/v1/assets', () => {
 
diff --git a/test/routes/api/auth/index.js b/test/server/routes/api/auth/index.js
similarity index 94%
rename from test/routes/api/auth/index.js
rename to test/server/routes/api/auth/index.js
index 38b867b7d..1d0ed6b3a 100644
--- a/test/routes/api/auth/index.js
+++ b/test/server/routes/api/auth/index.js
@@ -1,10 +1,10 @@
-const app = require('../../../../app');
+const app = require('../../../../../app');
 const chai = require('chai');
 const expect = chai.expect;
 
 chai.use(require('chai-http'));
 
-const UsersService = require('../../../../services/users');
+const UsersService = require('../../../../../services/users');
 
 describe('/api/v1/auth', () => {
   describe('#get', () => {
@@ -19,7 +19,7 @@ describe('/api/v1/auth', () => {
   });
 });
 
-const SettingsService = require('../../../../services/settings');
+const SettingsService = require('../../../../../services/settings');
 
 describe('/api/v1/auth/local', () => {
 
diff --git a/test/routes/api/settings/index.js b/test/server/routes/api/settings/index.js
similarity index 91%
rename from test/routes/api/settings/index.js
rename to test/server/routes/api/settings/index.js
index dfe846edf..54a8f357f 100644
--- a/test/routes/api/settings/index.js
+++ b/test/server/routes/api/settings/index.js
@@ -1,13 +1,13 @@
 const passport = require('../../../passport');
 
-const app = require('../../../../app');
+const app = require('../../../../../app');
 const chai = require('chai');
 const expect = chai.expect;
 
 chai.should();
 chai.use(require('chai-http'));
 
-const SettingsService = require('../../../../services/settings');
+const SettingsService = require('../../../../../services/settings');
 const defaults = {id: '1', moderation: 'PRE'};
 
 describe('/api/v1/settings', () => {
diff --git a/test/routes/api/user/index.js b/test/server/routes/api/user/index.js
similarity index 92%
rename from test/routes/api/user/index.js
rename to test/server/routes/api/user/index.js
index f6e202243..fc1feb66e 100644
--- a/test/routes/api/user/index.js
+++ b/test/server/routes/api/user/index.js
@@ -1,18 +1,18 @@
 const passport = require('../../../passport');
 
-const app = require('../../../../app');
-const mailer = require('../../../../services/mailer');
+const app = require('../../../../../app');
+const mailer = require('../../../../../services/mailer');
 const chai = require('chai');
 const expect = chai.expect;
 
-const SettingsService = require('../../../../services/settings');
+const SettingsService = require('../../../../../services/settings');
 const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
 // Setup chai.
 chai.should();
 chai.use(require('chai-http'));
 
-const UsersService = require('../../../../services/users');
+const UsersService = require('../../../../../services/users');
 
 describe('/api/v1/users/:user_id/email/confirm', () => {
 
diff --git a/test/services/actions.js b/test/server/services/actions.js
similarity index 96%
rename from test/services/actions.js
rename to test/server/services/actions.js
index 7fdec0a12..4d22dff6f 100644
--- a/test/services/actions.js
+++ b/test/server/services/actions.js
@@ -1,5 +1,5 @@
-const ActionModel = require('../../models/action');
-const ActionsService = require('../../services/actions');
+const ActionModel = require('../../../models/action');
+const ActionsService = require('../../../services/actions');
 
 const expect = require('chai').expect;
 
diff --git a/test/services/assets.js b/test/server/services/assets.js
similarity index 95%
rename from test/services/assets.js
rename to test/server/services/assets.js
index 3bbe8ee6e..e46e75576 100644
--- a/test/services/assets.js
+++ b/test/server/services/assets.js
@@ -1,6 +1,6 @@
-const AssetModel = require('../../models/asset');
-const AssetsService = require('../../services/assets');
-const SettingsService = require('../../services/settings');
+const AssetModel = require('../../../models/asset');
+const AssetsService = require('../../../services/assets');
+const SettingsService = require('../../../services/settings');
 
 const chai = require('chai');
 const expect = chai.expect;
diff --git a/test/services/comments.js b/test/server/services/comments.js
similarity index 96%
rename from test/services/comments.js
rename to test/server/services/comments.js
index 782c00560..5b9cbf4d1 100644
--- a/test/services/comments.js
+++ b/test/server/services/comments.js
@@ -1,10 +1,10 @@
-const CommentModel = require('../../models/comment');
-const ActionModel = require('../../models/action');
+const CommentModel = require('../../../models/comment');
+const ActionModel = require('../../../models/action');
 
-const ActionsService = require('../../services/actions');
-const UsersService = require('../../services/users');
-const SettingsService = require('../../services/settings');
-const CommentsService = require('../../services/comments');
+const ActionsService = require('../../../services/actions');
+const UsersService = require('../../../services/users');
+const SettingsService = require('../../../services/settings');
+const CommentsService = require('../../../services/comments');
 
 const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
 
diff --git a/test/services/domainlist.js b/test/server/services/domainlist.js
similarity index 90%
rename from test/services/domainlist.js
rename to test/server/services/domainlist.js
index db53b77b4..9dafa438a 100644
--- a/test/services/domainlist.js
+++ b/test/server/services/domainlist.js
@@ -1,6 +1,6 @@
 const expect = require('chai').expect;
-const Domainlist = require('../../services/domainlist');
-const SettingsService = require('../../services/settings');
+const Domainlist = require('../../../services/domainlist');
+const SettingsService = require('../../../services/settings');
 
 describe('services.Domainlist', () => {
 
diff --git a/test/services/scraper.js b/test/server/services/scraper.js
similarity index 100%
rename from test/services/scraper.js
rename to test/server/services/scraper.js
diff --git a/test/services/settings.js b/test/server/services/settings.js
similarity index 96%
rename from test/services/settings.js
rename to test/server/services/settings.js
index 3620ae633..e23548a83 100644
--- a/test/services/settings.js
+++ b/test/server/services/settings.js
@@ -1,4 +1,4 @@
-const SettingsService = require('../../services/settings');
+const SettingsService = require('../../../services/settings');
 const expect = require('chai').expect;
 
 describe('services.SettingsService', () => {
diff --git a/test/services/users.js b/test/server/services/users.js
similarity index 98%
rename from test/services/users.js
rename to test/server/services/users.js
index 94aa92432..aeb62d106 100644
--- a/test/services/users.js
+++ b/test/server/services/users.js
@@ -1,5 +1,5 @@
-const UsersService = require('../../services/users');
-const SettingsService = require('../../services/settings');
+const UsersService = require('../../../services/users');
+const SettingsService = require('../../../services/settings');
 
 const expect = require('chai').expect;
 
diff --git a/test/services/wordlist.js b/test/server/services/wordlist.js
similarity index 93%
rename from test/services/wordlist.js
rename to test/server/services/wordlist.js
index 6bd05e640..4a8b117ea 100644
--- a/test/services/wordlist.js
+++ b/test/server/services/wordlist.js
@@ -1,7 +1,7 @@
 const expect = require('chai').expect;
-const Errors = require('../../errors');
-const Wordlist = require('../../services/wordlist');
-const SettingsService = require('../../services/settings');
+const Errors = require('../../../errors');
+const Wordlist = require('../../../services/wordlist');
+const SettingsService = require('../../../services/settings');
 
 describe('services.Wordlist', () => {
 
diff --git a/yarn.lock b/yarn.lock
index fc62aee77..99c623050 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -368,31 +368,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.0.0, babel-core@^6.22.0:
-  version "6.22.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.1.tgz#9c5fd658ba1772d28d721f6d25d968fc7ae21648"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-generator "^6.22.0"
-    babel-helpers "^6.22.0"
-    babel-messages "^6.22.0"
-    babel-register "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.1"
-    babel-types "^6.22.0"
-    babylon "^6.11.0"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-
-babel-core@^6.24.0:
+babel-core@^6.0.0, babel-core@^6.24.0:
   version "6.24.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02"
   dependencies:
@@ -426,19 +402,7 @@ babel-eslint@^7.1.0:
     babylon "^6.13.0"
     lodash.pickby "^4.6.0"
 
-babel-generator@^6.18.0, babel-generator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.22.0.tgz#d642bf4961911a8adc7c692b0c9297f325cda805"
-  dependencies:
-    babel-messages "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-
-babel-generator@^6.24.0:
+babel-generator@^6.18.0, babel-generator@^6.24.0:
   version "6.24.0"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
   dependencies:
@@ -571,13 +535,6 @@ babel-helper-replace-supers@^6.22.0:
     babel-traverse "^6.22.0"
     babel-types "^6.22.0"
 
-babel-helpers@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.22.0.tgz#d275f55f2252b8101bff07bc0c556deda657392c"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-
 babel-helpers@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
@@ -602,13 +559,7 @@ babel-loader@^6.4.1:
     mkdirp "^0.5.1"
     object-assign "^4.0.1"
 
-babel-messages@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.22.0.tgz#36066a214f1217e4ed4164867669ecb39e3ea575"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-messages@^6.23.0:
+babel-messages@^6.22.0, babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
   dependencies:
@@ -1049,18 +1000,6 @@ babel-preset-stage-3@^6.22.0:
     babel-plugin-transform-exponentiation-operator "^6.22.0"
     babel-plugin-transform-object-rest-spread "^6.22.0"
 
-babel-register@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.22.0.tgz#a61dd83975f9ca4a9e7d6eff3059494cd5ea4c63"
-  dependencies:
-    babel-core "^6.22.0"
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
-
 babel-register@^6.24.0:
   version "6.24.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd"
@@ -1080,17 +1019,7 @@ babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtim
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.3.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.22.0.tgz#403d110905a4626b317a2a1fcb8f3b73204b2edb"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-    babylon "^6.11.0"
-    lodash "^4.2.0"
-
-babel-template@^6.23.0:
+babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0, babel-template@^6.3.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
   dependencies:
@@ -1100,21 +1029,7 @@ babel-template@^6.23.0:
     babylon "^6.11.0"
     lodash "^4.2.0"
 
-babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.22.1:
-  version "6.22.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.22.1.tgz#3b95cd6b7427d6f1f757704908f2fc9748a5f59f"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-messages "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-    babylon "^6.15.0"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.23.0, babel-traverse@^6.23.1:
+babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
   version "6.23.1"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
   dependencies:
@@ -1128,16 +1043,7 @@ babel-traverse@^6.23.0, babel-traverse@^6.23.1:
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.22.0.tgz#2a447e8d0ea25d2512409e4175479fd78cc8b1db"
-  dependencies:
-    babel-runtime "^6.22.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babel-types@^6.23.0:
+babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
   dependencies:
@@ -2914,7 +2820,7 @@ fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
 
-fbjs@^0.8.4, fbjs@^0.8.9:
+fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.9:
   version "0.8.11"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.11.tgz#340b590b8a2278a01ef7467c07a16da9b753db24"
   dependencies:
@@ -3602,13 +3508,14 @@ highlight-words-core@^1.0.2:
   dependencies:
     babel-runtime "^6.11.6"
 
-history@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/history/-/history-3.2.1.tgz#71c7497f4e6090363d19a6713bb52a1bfcdd99aa"
+history@^4.6.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/history/-/history-4.6.1.tgz#911cf8eb65728555a94f2b12780a0c531a14d2fd"
   dependencies:
     invariant "^2.2.1"
     loose-envify "^1.2.0"
-    query-string "^4.2.2"
+    resolve-pathname "^2.0.0"
+    value-equal "^0.2.0"
     warning "^3.0.0"
 
 hoek@2.x.x:
@@ -3881,7 +3788,7 @@ interpret@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
 
-invariant@^2.0.0, invariant@^2.2.0, invariant@^2.2.1:
+invariant@^2.0.0, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
@@ -4815,7 +4722,7 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
@@ -5678,7 +5585,7 @@ path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
 
-path-to-regexp@^1.7.0:
+path-to-regexp@^1.5.3, path-to-regexp@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
   dependencies:
@@ -6455,7 +6362,7 @@ qs@~6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
 
-query-string@^4.1.0, query-string@^4.2.2:
+query-string@^4.1.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.1.tgz#54baada6713eafc92be75c47a731f2ebd09cd11d"
   dependencies:
@@ -6518,10 +6425,6 @@ rc@^1.0.1, rc@~1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~1.0.4"
 
-react-addons-test-utils@15.3.2:
-  version "15.3.2"
-  resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.3.2.tgz#c09a44f583425a4a9c1b38444d7a6c3e6f0f41f6"
-
 react-apollo@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-0.10.1.tgz#97fd50855f8575672aa68330b9c64a201cd13343"
@@ -6537,15 +6440,11 @@ react-apollo@^0.10.0:
   optionalDependencies:
     react-dom "0.14.x || 15.* || ^15.0.0"
 
-"react-dom@0.14.x || 15.* || ^15.0.0", react-dom@^15.3.1:
-  version "15.3.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.3.2.tgz#c46b0aa5380d7b838e7a59c4a7beff2ed315531f"
-
-react-dom@next:
-  version "16.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0-alpha.5.tgz#2e1b8efc3ba1c3000210ad364a6b385f1306655c"
+"react-dom@0.14.x || 15.* || ^15.0.0", react-dom@^15.3.1, react-dom@^15.4.2:
+  version "15.4.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
   dependencies:
-    fbjs "^0.8.9"
+    fbjs "^0.8.1"
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
@@ -6597,14 +6496,14 @@ react-redux@^4.4.5:
     lodash "^4.2.0"
     loose-envify "^1.1.0"
 
-react-router@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.0.2.tgz#5a19156678810e01d81901f9c0fef63284b8a514"
+react-router@next:
+  version "4.0.0-beta.8"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.0.0-beta.8.tgz#368cfe540d23d5d23419b42fb915d465f268b66b"
   dependencies:
-    history "^3.0.0"
-    hoist-non-react-statics "^1.2.0"
-    invariant "^2.2.1"
-    loose-envify "^1.2.0"
+    history "^4.6.0"
+    invariant "^2.2.2"
+    loose-envify "^1.3.1"
+    path-to-regexp "^1.5.3"
     warning "^3.0.0"
 
 react-tagsinput@^3.14.0:
@@ -6956,6 +6855,10 @@ resolve-from@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
 
+resolve-pathname@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.0.2.tgz#e55c016eb2e9df1de98e85002282bfb38c630436"
+
 resolve@^1.1.6, resolve@^1.1.7:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
@@ -7870,6 +7773,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
+value-equal@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.2.0.tgz#4f41c60a3fc011139a2ec3d3340a8998ae8b69c0"
+
 vary@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.0.tgz#e1e5affbbd16ae768dd2674394b9ad3022653140"