diff --git a/test/Errors.test.js b/test/Errors.test.js
index 18e9a30a9..f512a0c7f 100644
--- a/test/Errors.test.js
+++ b/test/Errors.test.js
@@ -70,6 +70,9 @@ describe("Errors", function() {
 				a: "./require-entry-point",
 				b: "./entry-point",
 				c: ["./entry-point2"]
+			},
+			output: {
+				filename: "[name].js"
 			}
 		}, function(errors, warnings) {
 			errors.length.should.be.eql(2);
diff --git a/test/HotModuleReplacementPlugin.test.js b/test/HotModuleReplacementPlugin.test.js
index 4ac9acc9d..da50cbacc 100644
--- a/test/HotModuleReplacementPlugin.test.js
+++ b/test/HotModuleReplacementPlugin.test.js
@@ -19,7 +19,7 @@ describe("HotModuleReplacementPlugin", function() {
 			},
 			plugins: [
 				new webpack.HotModuleReplacementPlugin(),
-				new webpack.optimize.OccurenceOrderPlugin()
+				new webpack.optimize.OccurrenceOrderPlugin()
 			]
 		});
 		fs.writeFileSync(entryFile, "1", "utf-8");
diff --git a/test/cases/parsing/context/index.js b/test/cases/parsing/context/index.js
index 3a42fc644..888b04bd6 100644
--- a/test/cases/parsing/context/index.js
+++ b/test/cases/parsing/context/index.js
@@ -13,8 +13,6 @@ it("should automatically create contexts", function() {
 	require("./templates/" + tmp + "l").should.be.eql("test template");
 	require("./templates/t" + mpl).should.be.eql("test template");
 	require("./templates/t" + mp + "l").should.be.eql("test template");
-	require("./templates/templateLoader")(templateFull).should.be.eql("test template");
-	require("./templates/templateLoaderIndirect")(templateFull).should.be.eql("test template");
 });
 
 it("should be able to require.resolve with automatical context", function() {
diff --git a/test/cases/parsing/context/warnings.js b/test/cases/parsing/context/warnings.js
index 437e1006f..7fe351b89 100644
--- a/test/cases/parsing/context/warnings.js
+++ b/test/cases/parsing/context/warnings.js
@@ -2,5 +2,4 @@ module.exports = [
 	[/Module parse failed/, /dump-file\.txt/, /templates \^\\\.\\\/\.\*\$/],
 	[/Critical dependencies/, /templateLoader\.js/],
 	[/Critical dependencies/, /templateLoaderIndirect\.js/],
-	[/Critical dependencies/, /templateLoaderIndirect\.js/],
 ];
\ No newline at end of file
diff --git a/test/cases/parsing/evaluate/index.js b/test/cases/parsing/evaluate/index.js
index 4a3935d2a..d914c9efe 100644
--- a/test/cases/parsing/evaluate/index.js
+++ b/test/cases/parsing/evaluate/index.js
@@ -1,10 +1,3 @@
-it("should define DEBUG", function() {
-	DEBUG.should.be.eql(false);
-	(typeof DEBUG).should.be.eql("boolean");
-	var x = require(DEBUG ? "fail" : "./a");
-	var y = DEBUG ? require("fail") : require("./a");
-});
-
 it("should evaluate null", function() {
 	var y = null ? require("fail") : require("./a");
 	if(null)
@@ -13,8 +6,8 @@ it("should evaluate null", function() {
 
 it("should short-circut evaluating", function() {
 	var expr;
-	var a = DEBUG && expr ? require("fail") : require("./a");
-	var b = !DEBUG || expr ? require("./a") : require("fail");
+	var a = false && expr ? require("fail") : require("./a");
+	var b = true || expr ? require("./a") : require("fail");
 });
 
 it("should evaluate __dirname and __resourceQuery with replace and substr", function() {
diff --git a/test/configCases/parsing/context/index.js b/test/configCases/parsing/context/index.js
new file mode 100644
index 000000000..baffd5e40
--- /dev/null
+++ b/test/configCases/parsing/context/index.js
@@ -0,0 +1,5 @@
+it("should automatically create contexts", function() {
+	var template = "tmpl", templateFull = "./tmpl.js";
+	require("../../../cases/parsing/context/templates/templateLoader")(templateFull).should.be.eql("test template");
+	require("../../../cases/parsing/context/templates/templateLoaderIndirect")(templateFull).should.be.eql("test template");
+});
\ No newline at end of file
diff --git a/test/configCases/parsing/context/warnings.js b/test/configCases/parsing/context/warnings.js
new file mode 100644
index 000000000..d05bd2c04
--- /dev/null
+++ b/test/configCases/parsing/context/warnings.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/Module parse failed/, /dump-file\.txt/, /templates \^\\\.\\\//]
+];
\ No newline at end of file
diff --git a/test/configCases/parsing/context/webpack.config.js b/test/configCases/parsing/context/webpack.config.js
new file mode 100644
index 000000000..0f4964e9a
--- /dev/null
+++ b/test/configCases/parsing/context/webpack.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+	module: {
+		unknownContextRegExp: /^\.\//,
+		unknownContextCritical: false,
+		exprContextRegExp: /^\.\//,
+		exprContextCritical: false
+	}
+};
\ No newline at end of file
diff --git a/test/configCases/plugins/define-plugin/a.js b/test/configCases/plugins/define-plugin/a.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/configCases/plugins/define-plugin/index.js b/test/configCases/plugins/define-plugin/index.js
index e28180f25..1efd06735 100644
--- a/test/configCases/plugins/define-plugin/index.js
+++ b/test/configCases/plugins/define-plugin/index.js
@@ -1,3 +1,10 @@
+it("should define FALSE", function() {
+	FALSE.should.be.eql(false);
+	(typeof TRUE).should.be.eql("boolean");
+	var x = require(FALSE ? "fail" : "./a");
+	var y = FALSE ? require("fail") : require("./a");
+});
+
 it("should define CODE", function() {
 	CODE.should.be.eql(3);
 	(typeof CODE).should.be.eql("number");
diff --git a/test/configCases/plugins/define-plugin/webpack.config.js b/test/configCases/plugins/define-plugin/webpack.config.js
index a7f25a659..8c89c6540 100644
--- a/test/configCases/plugins/define-plugin/webpack.config.js
+++ b/test/configCases/plugins/define-plugin/webpack.config.js
@@ -2,6 +2,8 @@ var DefinePlugin = require("../../../../lib/DefinePlugin");
 module.exports = {
 	plugins: [
 		new DefinePlugin({
+			TRUE: true,
+			FALSE: false,
 			UNDEFINED: undefined,
 			FUNCTION: function(a) { return a + 1; },
 			CODE: "(1+2)",