diff --git a/package-lock.json b/package-lock.json
index 35c7ab69..e5b809a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@types/node": {
-      "version": "6.0.88",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.88.tgz",
-      "integrity": "sha512-bYDPZTX0/s1aihdjLuAgogUAT5M+TpoWChEMea2p0yOcfn5bu3k6cJb9cp6nw268XeSNIGGr+4+/8V5K6BGzLQ==",
+      "version": "6.0.89",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.89.tgz",
+      "integrity": "sha512-Z/67L97+6H1qJiEEHSN1SQapkWjDss1D90rAnFcQ6UxKkah9juzotK5UNEP1bDv/0lJ3NAQTnVfc/JWdgCGruA==",
       "dev": true
     },
     "JSONStream": {
@@ -625,102 +625,6 @@
       "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
       "dev": true
     },
-    "autodll-webpack-plugin": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/autodll-webpack-plugin/-/autodll-webpack-plugin-0.2.1.tgz",
-      "integrity": "sha512-3h1UqEeFHrB1sB+tcxu0x8Fsnu6rnOp1GV4h4VALHMAZYSv67++T/G89C8e//cud5Sgo3mslIJdY/G0ugklhSQ==",
-      "dev": true,
-      "requires": {
-        "bluebird": "3.5.0",
-        "del": "3.0.0",
-        "find-cache-dir": "1.0.0",
-        "lodash": "4.17.4",
-        "make-dir": "1.0.0",
-        "memory-fs": "0.4.1"
-      },
-      "dependencies": {
-        "del": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-          "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
-          "dev": true,
-          "requires": {
-            "globby": "6.1.0",
-            "is-path-cwd": "1.0.0",
-            "is-path-in-cwd": "1.0.0",
-            "p-map": "1.1.1",
-            "pify": "3.0.0",
-            "rimraf": "2.6.1"
-          }
-        },
-        "find-cache-dir": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
-          "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
-          "dev": true,
-          "requires": {
-            "commondir": "1.0.1",
-            "make-dir": "1.0.0",
-            "pkg-dir": "2.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "1.0.2",
-            "glob": "7.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-              "dev": true
-            }
-          }
-        },
-        "memory-fs": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-          "dev": true,
-          "requires": {
-            "errno": "0.1.4",
-            "readable-stream": "2.2.11"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-          "dev": true,
-          "requires": {
-            "find-up": "2.1.0"
-          }
-        }
-      }
-    },
     "autoprefixer": {
       "version": "7.1.4",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.4.tgz",
@@ -4563,16 +4467,6 @@
         }
       }
     },
-    "create-react-class": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.2.tgz",
-      "integrity": "sha1-zx7RXxKq1/FO9fLf4F5sQvke8Co=",
-      "requires": {
-        "fbjs": "0.8.12",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1"
-      }
-    },
     "cross-spawn": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
@@ -5649,9 +5543,9 @@
       "dev": true
     },
     "enzyme": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.0.0.tgz",
-      "integrity": "sha1-lM42QlTcZUxOYZsl7sxkS/ZIHec=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.1.0.tgz",
+      "integrity": "sha1-2MqECFeQ+87G7UC63RRHj67kwlo=",
       "dev": true,
       "requires": {
         "cheerio": "1.0.0-rc.2",
@@ -5666,6 +5560,30 @@
         "rst-selector-parser": "2.2.2"
       }
     },
+    "enzyme-adapter-react-16": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.1.tgz",
+      "integrity": "sha1-Bmyxc15l2NlYQaAj+U2rPOYQnhc=",
+      "dev": true,
+      "requires": {
+        "enzyme-adapter-utils": "1.0.1",
+        "lodash": "4.17.4",
+        "object.assign": "4.0.4",
+        "object.values": "1.0.4",
+        "prop-types": "15.6.0"
+      }
+    },
+    "enzyme-adapter-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.0.1.tgz",
+      "integrity": "sha1-/NgSIzOaVaMS91UmQeBFxAQIQAk=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4",
+        "object.assign": "4.0.4",
+        "prop-types": "15.6.0"
+      }
+    },
     "enzyme-to-json": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/enzyme-to-json/-/enzyme-to-json-3.0.1.tgz",
@@ -6993,15 +6911,6 @@
         "object-assign": "4.1.1"
       }
     },
-    "file-loader": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
-      "integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0"
-      }
-    },
     "file-type": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
@@ -7215,12 +7124,6 @@
       "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
       "dev": true
     },
-    "flow-bin": {
-      "version": "0.55.0",
-      "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.55.0.tgz",
-      "integrity": "sha1-kIPakye9jKtrQHbWPYXyJHp+rhs=",
-      "dev": true
-    },
     "for-each": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz",
@@ -12928,12 +12831,6 @@
         "p-limit": "1.1.0"
       }
     },
-    "p-map": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz",
-      "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno=",
-      "dev": true
-    },
     "p-pipe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.1.0.tgz",
@@ -13123,7 +13020,7 @@
       "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=",
       "dev": true,
       "requires": {
-        "@types/node": "6.0.88"
+        "@types/node": "6.0.89"
       }
     },
     "parseurl": {
@@ -15838,16 +15735,6 @@
         }
       }
     },
-    "react-ga": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/react-ga/-/react-ga-2.2.0.tgz",
-      "integrity": "sha1-RSNd4TVuTZiNm4IhTWFaCEickpE=",
-      "requires": {
-        "create-react-class": "15.6.2",
-        "object-assign": "4.1.1",
-        "prop-types": "15.6.0"
-      }
-    },
     "react-headroom": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/react-headroom/-/react-headroom-2.2.1.tgz",
@@ -15997,6 +15884,33 @@
         "shallowequal": "1.0.2"
       }
     },
+    "react-test-renderer": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.0.0.tgz",
+      "integrity": "sha1-n+e4MI8vcfKfw1bUECCG8THJyxU=",
+      "dev": true,
+      "requires": {
+        "fbjs": "0.8.16",
+        "object-assign": "4.1.1"
+      },
+      "dependencies": {
+        "fbjs": {
+          "version": "0.8.16",
+          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
+          "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
+          "dev": true,
+          "requires": {
+            "core-js": "1.2.7",
+            "isomorphic-fetch": "2.2.1",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1",
+            "promise": "7.1.1",
+            "setimmediate": "1.0.5",
+            "ua-parser-js": "0.7.12"
+          }
+        }
+      }
+    },
     "read-all-stream": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
@@ -17824,16 +17738,6 @@
         "escape-string-regexp": "1.0.5"
       }
     },
-    "style-loader": {
-      "version": "0.18.2",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz",
-      "integrity": "sha512-WPpJPZGUxWYHWIUMNNOYqql7zh85zGmr84FdTVWq52WTIkqlW9xSxD3QYWi/T31cqn9UNSsietVEgGn2aaSCzw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0",
-        "schema-utils": "0.3.0"
-      }
-    },
     "style-search": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
@@ -18883,16 +18787,6 @@
         }
       }
     },
-    "url-loader": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz",
-      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0",
-        "mime": "1.3.4"
-      }
-    },
     "url-parse-lax": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
diff --git a/package.json b/package.json
index adbd2bf3..86135960 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,8 @@
     "commitizen": "^2.9.6",
     "compression-webpack-plugin": "^1.0.0",
     "css-loader": "^0.28.7",
-    "enzyme": "^3.0.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.1",
     "enzyme-to-json": "^3.0.1",
     "eslint": "^4.7.2",
     "eslint-config-standard": "^10.2.1",
@@ -122,6 +123,7 @@
     "react-addons-perf": "^15.4.2",
     "react-addons-test-utils": "^15.6.2",
     "react-hot-loader": "^3.0.0-beta.6",
+    "react-test-renderer": "^16.0.0",
     "redux-devtools-extension": "^2.13.2",
     "redux-mock-store": "^1.3.0",
     "resolve-url-loader": "^2.1.0",
@@ -158,6 +160,7 @@
     "server_build": "NODE_ENV=production webpack --config webpack_config/server/webpack.prod.babel.js",
     "frontend_build": "NODE_ENV=production webpack --config webpack_config/client/webpack.prod.babel.js",
     "test": "NODE_ENV=test jest --config=jest_config/jest.config.json --coverage --forceExit || true",
+    "snapshot_update": "NODE_ENV=test jest --config=jest_config/jest.config.json --coverage --updateSnapshot",
     "genssl": "openssl req -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout ./src/server/config/ssl/server.key -out ./src/server/config/ssl/server.crt",
     "start": "node ./dist/server",
     "lint:styles": "stylelint ./src/common/**/*.scss -s scss --config ./.stylelintrc --fix",