diff --git a/test/compress/evaluate.js b/test/compress/evaluate.js
index 0230de10..7792dc94 100644
--- a/test/compress/evaluate.js
+++ b/test/compress/evaluate.js
@@ -1288,7 +1288,7 @@ issue_2231_1: {
     }
     expect_stdout: true
     expect_warnings: [
-        "WARN: Error evaluating Object.keys(void 0) [test/compress/evaluate.js:1191,20]",
+        "WARN: Error evaluating Object.keys(void 0) [test/compress/evaluate.js:1284,20]",
     ]
 }
 
@@ -1305,7 +1305,7 @@ issue_2231_2: {
     }
     expect_stdout: true
     expect_warnings: [
-        "WARN: Error evaluating Object.getOwnPropertyNames(null) [test/compress/evaluate.js:1208,20]",
+        "WARN: Error evaluating Object.getOwnPropertyNames(null) [test/compress/evaluate.js:1301,20]",
     ]
 }
 
@@ -1443,14 +1443,14 @@ issue_2535_3: {
     }
     expect_stdout: true
     expect_warnings: [
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1409,20]",
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1410,20]",
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1411,20]",
-        "WARN: Condition left of && always false [test/compress/evaluate.js:1411,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1412,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1413,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1414,20]",
-        "WARN: Condition left of || always true [test/compress/evaluate.js:1414,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1429,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1430,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1431,20]",
+        "WARN: Condition left of && always false [test/compress/evaluate.js:1431,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1432,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1433,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1434,20]",
+        "WARN: Condition left of || always true [test/compress/evaluate.js:1434,20]",
     ]
 }
 
diff --git a/test/compress/harmony.js b/test/compress/harmony.js
index f8120eae..29a27b7d 100644
--- a/test/compress/harmony.js
+++ b/test/compress/harmony.js
@@ -1276,8 +1276,7 @@ issue_2794_1: {
     }
     expect: {
         function foo() {
-            for (const a of (va = value, doSomething(va))) console.log(a);
-            var va;
+            for (const a of doSomething(value)) console.log(a);
         }
         function doSomething(x) {
             return [ x, 2 * x, 3 * x ];
@@ -1326,8 +1325,7 @@ issue_2794_2: {
     }
     expect: {
         function foo() {
-            for (const n of (o = value, doSomething(o))) console.log(n);
-            var o;
+            for (const o of doSomething(value)) console.log(o);
         }
         function doSomething(o) {
             return [ o, 2 * o, 3 * o ];
diff --git a/test/compress/issue-203.js b/test/compress/issue-203.js
index 896982b5..e95ca23e 100644
--- a/test/compress/issue-203.js
+++ b/test/compress/issue-203.js
@@ -2,7 +2,7 @@
 compress_new_function: {
     options = {
         unsafe: true,
-        unsafe_Func: true,
+        unsafe_Function: true,
     }
     input: {
         new Function("aa, bb", 'return aa;');
@@ -15,7 +15,7 @@ compress_new_function: {
 compress_new_function_with_destruct: {
     options = {
         unsafe: true,
-        unsafe_Func: true,
+        unsafe_Function: true,
         ecma: 6
     }
     beautify = {
@@ -38,7 +38,7 @@ compress_new_function_with_destruct_arrows: {
         arrows: true,
         unsafe_arrows: true,
         unsafe: true,
-        unsafe_Func: true,
+        unsafe_Function: true,
         ecma: 6,
     }
     beautify = {
diff --git a/test/mocha/cli.js b/test/mocha/cli.js
index 33e111a2..3804d823 100644
--- a/test/mocha/cli.js
+++ b/test/mocha/cli.js
@@ -743,36 +743,4 @@ describe("bin/uglifyjs", function () {
             done();
         });
     });
-    it("Should work with explicit --rename", function(done) {
-        var command = uglifyjscmd + " test/input/rename/input.js --rename";
-        exec(command, function(err, stdout, stderr) {
-            if (err) throw err;
-            assert.strictEqual(stdout, "function f(a){return b(a);function b(c){return c}}\n");
-            done();
-        });
-    });
-    it("Should work with explicit --no-rename", function(done) {
-        var command = uglifyjscmd + " test/input/rename/input.js -mc --no-rename";
-        exec(command, function(err, stdout, stderr) {
-            if (err) throw err;
-            assert.strictEqual(stdout, "function f(n){return function(n){return n}(n)}\n");
-            done();
-        });
-    });
-    it("Should work with implicit --rename", function(done) {
-        var command = uglifyjscmd + " test/input/rename/input.js -mc";
-        exec(command, function(err, stdout, stderr) {
-            if (err) throw err;
-            assert.strictEqual(stdout, "function f(n){return n}\n");
-            done();
-        });
-    });
-    it("Should work with implicit --no-rename", function(done) {
-        var command = uglifyjscmd + " test/input/rename/input.js -c";
-        exec(command, function(err, stdout, stderr) {
-            if (err) throw err;
-            assert.strictEqual(stdout, "function f(x){return function(x){return x}(x)}\n");
-            done();
-        });
-    });
 });