diff --git a/.eslintignore b/.eslintignore
index 9bef6ff66d3..b56f42833b6 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -7,3 +7,4 @@ docs/*
 fields/types/**/lib/*
 node_modules/*
 test/*
+website/*
diff --git a/fields/types/boolean/BooleanType.js b/fields/types/boolean/BooleanType.js
index 220721e1535..17a44630581 100644
--- a/fields/types/boolean/BooleanType.js
+++ b/fields/types/boolean/BooleanType.js
@@ -36,7 +36,9 @@ boolean.prototype.validateInput = function (data, callback) {
 
 boolean.prototype.validateRequiredInput = function (item, data, callback) {
 	var value = this.getValueFromData(data);
-	var result = (value && value !== 'false') || typeof item.get(this.path) === 'boolean' ? true : false;
+	var result = value && value !== 'false'
+			? true
+			: false;
 	utils.defer(callback, result);
 };
 
diff --git a/package.json b/package.json
index 6f7e04e0aba..156dd98610f 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,7 @@
     "build-dev": "node build.js > ./admin/public/js/packages.js",
     "pretest": "npm run lint && node test/pretest.js",
     "test": "mocha && mocha --opts test/mocha-admin.opts",
-    "test-all": "npm test && npm run test-e2e-bg",
+    "test-all": "npm test",
     "test-unit": "node test/pretest.js && mocha",
     "test-admin": "mocha --opts test/mocha-admin.opts",
     "test-e2e": "node test/e2e/server.js --env default",
diff --git a/yarn.lock b/yarn.lock
index a7e0d9e3a2a..67cc2b526c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4043,9 +4043,9 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-knox@keystonejs/knox:
-  version "0.9.2"
-  resolved "https://codeload.github.com/keystonejs/knox/tar.gz/170c579ae8c0f7268d73dae77a6455f5c962d530"
+knox-s3@0.9.5:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/knox-s3/-/knox-s3-0.9.5.tgz#48fe99953ccb57697d184f631bc8efe8f1dcb575"
   dependencies:
     debug "^2.2.0"
     mime "^1.4.0"
@@ -4697,9 +4697,9 @@ module-not-found-error@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
 
-moment@2.18.1:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
+moment@2.19.3:
+  version "2.19.3"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.3.tgz#bdb99d270d6d7fda78cc0fbace855e27fe7da69f"
 
 moment@^2.14.1:
   version "2.19.1"