diff --git a/test/language/statements/block/12.1-1.js b/test/language/statements/block/12.1-1.js
index 5655c14fb4..0f1ddd0237 100644
--- a/test/language/statements/block/12.1-1.js
+++ b/test/language/statements/block/12.1-1.js
@@ -4,15 +4,9 @@
 /*---
 es5id: 12.1-1
 description: "12.1 - block '{ StatementListopt };' is not allowed: try-catch"
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("try{};catch(){}");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/block/12.1-2.js b/test/language/statements/block/12.1-2.js
index 3e40203851..b0b41000c4 100644
--- a/test/language/statements/block/12.1-2.js
+++ b/test/language/statements/block/12.1-2.js
@@ -6,15 +6,9 @@ es5id: 12.1-2
 description: >
     12.1 - block '{ StatementListopt };' is not allowed:
     try-catch-finally
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("try{};catch{};finally{}");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/block/12.1-3.js b/test/language/statements/block/12.1-3.js
index ad2b8d8411..a7fb97e72e 100644
--- a/test/language/statements/block/12.1-3.js
+++ b/test/language/statements/block/12.1-3.js
@@ -4,15 +4,9 @@
 /*---
 es5id: 12.1-3
 description: "12.1 - block '{ StatementListopt };' is not allowed: try-finally"
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("try{};finally{}");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/block/12.1-4.js b/test/language/statements/block/12.1-4.js
index b7284151fa..bf130e4594 100644
--- a/test/language/statements/block/12.1-4.js
+++ b/test/language/statements/block/12.1-4.js
@@ -4,15 +4,9 @@
 /*---
 es5id: 12.1-4
 description: "12.1 - block '{ StatementListopt };' is not allowed: if-else"
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("if{};else{}");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/block/12.1-5.js b/test/language/statements/block/12.1-5.js
index 908ddcda1a..2ac6f46085 100644
--- a/test/language/statements/block/12.1-5.js
+++ b/test/language/statements/block/12.1-5.js
@@ -4,15 +4,9 @@
 /*---
 es5id: 12.1-5
 description: "12.1 - block '{ StatementListopt };' is not allowed: if-else-if"
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("if{};else if{}");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/block/12.1-6.js b/test/language/statements/block/12.1-6.js
index f46fd21695..deeffa1710 100644
--- a/test/language/statements/block/12.1-6.js
+++ b/test/language/statements/block/12.1-6.js
@@ -6,15 +6,9 @@ es5id: 12.1-6
 description: >
     12.1 - block '{ StatementListopt };' is not allowed:
     if-else-if-else
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("if{};else if{};else{}");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/block/12.1-7.js b/test/language/statements/block/12.1-7.js
index c251e8f930..ee5c6acdfc 100644
--- a/test/language/statements/block/12.1-7.js
+++ b/test/language/statements/block/12.1-7.js
@@ -4,15 +4,9 @@
 /*---
 es5id: 12.1-7
 description: "12.1 - block '{ StatementListopt };' is not allowed: do-while"
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("do{};while()");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-1.js b/test/language/statements/function/13.0-1.js
index 7e0e308ce0..33b5fd66e8 100644
--- a/test/language/statements/function/13.0-1.js
+++ b/test/language/statements/function/13.0-1.js
@@ -6,15 +6,9 @@ es5id: 13.0-1
 description: >
     13.0 - multiple names in one function declaration is not allowed,
     two function names
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("function x, y() {}");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-10-s.js b/test/language/statements/function/13.0-10-s.js
index 9368a83bc1..5964e461f1 100644
--- a/test/language/statements/function/13.0-10-s.js
+++ b/test/language/statements/function/13.0-10-s.js
@@ -11,11 +11,8 @@ description: >
     the code of this FunctionBody with an inner function contains a
     Use Strict Directive
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         function _13_0_10_fun() {
             function _13_0_10_inner() {
                 "use strict";
@@ -23,11 +20,6 @@ function testcase() {
             }
             _13_0_10_inner();
         };
-        try {
+assert.throws(SyntaxError, function() {
             _13_0_10_fun();
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-11-s.js b/test/language/statements/function/13.0-11-s.js
index 5686b6e1b3..5a7684a822 100644
--- a/test/language/statements/function/13.0-11-s.js
+++ b/test/language/statements/function/13.0-11-s.js
@@ -11,11 +11,8 @@ description: >
     the code of this FunctionBody with an inner function which is in
     strict mode
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         function _13_0_11_fun() {
             "use strict";
             function _13_0_11_inner() {
@@ -23,11 +20,6 @@ function testcase() {
             }
             _13_0_11_inner();
         };
-        try {
+assert.throws(SyntaxError, function() {
             _13_0_11_fun();
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-13-s.js b/test/language/statements/function/13.0-13-s.js
index 0615fe0201..d5f73e2c50 100644
--- a/test/language/statements/function/13.0-13-s.js
+++ b/test/language/statements/function/13.0-13-s.js
@@ -11,16 +11,9 @@ description: >
     the function body of a Function constructor begins with a Strict
     Directive
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
        
-        try {
+assert.throws(SyntaxError, function() {
             eval("var _13_0_13_fun = new Function(\" \", \"'use strict'; eval = 42;\"); _13_0_13_fun();");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-14-s.js b/test/language/statements/function/13.0-14-s.js
index 22bcc0d763..5a518430ab 100644
--- a/test/language/statements/function/13.0-14-s.js
+++ b/test/language/statements/function/13.0-14-s.js
@@ -11,17 +11,10 @@ description: >
     the function body of a Function constructor contains a Strict
     Directive
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             var _13_0_14_fun = new Function(" ", "'use strict'; eval = 42; ");
             _13_0_14_fun();
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-15-s.js b/test/language/statements/function/13.0-15-s.js
index 728dcb034e..6281c22c38 100644
--- a/test/language/statements/function/13.0-15-s.js
+++ b/test/language/statements/function/13.0-15-s.js
@@ -11,17 +11,10 @@ description: >
     a FunctionDeclaration is contained in strict mode code within eval
     code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; function _13_0_15_fun() {eval = 42;};");
             _13_0_15_fun();
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-16-s.js b/test/language/statements/function/13.0-16-s.js
index 3eefb46e32..c825848e2c 100644
--- a/test/language/statements/function/13.0-16-s.js
+++ b/test/language/statements/function/13.0-16-s.js
@@ -11,17 +11,10 @@ description: >
     a FunctionExpression is contained in strict mode code within eval
     code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; var _13_0_16_fun = function () {eval = 42;};");
             _13_0_16_fun();
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-2.js b/test/language/statements/function/13.0-2.js
index f2baa5a68d..7a3712f061 100644
--- a/test/language/statements/function/13.0-2.js
+++ b/test/language/statements/function/13.0-2.js
@@ -6,15 +6,9 @@ es5id: 13.0-2
 description: >
     13.0 - multiple names in one function declaration is not allowed,
     three function names
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("function x,y,z(){}");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-3.js b/test/language/statements/function/13.0-3.js
index 7ffb99d438..f4eab6a1c8 100644
--- a/test/language/statements/function/13.0-3.js
+++ b/test/language/statements/function/13.0-3.js
@@ -6,16 +6,9 @@ es5id: 13.0-3
 description: >
     13.0 - property names in function definition is not allowed, add a
     new property into object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var obj = {};
-        try {
+assert.throws(SyntaxError, function() {
             eval("function obj.tt() {};");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-4.js b/test/language/statements/function/13.0-4.js
index 56225bf7d8..ace2f52e13 100644
--- a/test/language/statements/function/13.0-4.js
+++ b/test/language/statements/function/13.0-4.js
@@ -6,17 +6,10 @@ es5id: 13.0-4
 description: >
     13.0 - multiple names in one function declaration is not allowed,
     add a new property into a property which is a object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var obj = {};
         obj.tt = { len: 10 };
-        try {
+assert.throws(SyntaxError, function() {
             eval("function obj.tt.ss() {};");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-7-s.js b/test/language/statements/function/13.0-7-s.js
index 0c6ae6cfd9..9e280a909a 100644
--- a/test/language/statements/function/13.0-7-s.js
+++ b/test/language/statements/function/13.0-7-s.js
@@ -11,17 +11,10 @@ description: >
     the code of this FunctionDeclaration is contained in non-strict
     mode but the call to eval is a direct call in strict mode code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; function _13_0_7_fun() {eval = 42;};");
             _13_0_7_fun();
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.0-9-s.js b/test/language/statements/function/13.0-9-s.js
index c2b1bf20f9..15145ababa 100644
--- a/test/language/statements/function/13.0-9-s.js
+++ b/test/language/statements/function/13.0-9-s.js
@@ -11,19 +11,12 @@ description: >
     a FunctionDeclaration that is contained in strict mode code has an
     inner function
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var _13_0_9_fun = function () {
             function _13_0_9_inner() { eval("eval = 42;"); }
             _13_0_9_inner();
         };
-        try {
+assert.throws(SyntaxError, function() {
             _13_0_9_fun();
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-1-s.js b/test/language/statements/function/13.1-1-s.js
index 077414ba0c..cb5ad0aea6 100644
--- a/test/language/statements/function/13.1-1-s.js
+++ b/test/language/statements/function/13.1-1-s.js
@@ -12,15 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionDeclaration
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("function _13_1_1_fun(eval) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-10-s.js b/test/language/statements/function/13.1-10-s.js
index 41acf78913..a57ddb8efd 100644
--- a/test/language/statements/function/13.1-10-s.js
+++ b/test/language/statements/function/13.1-10-s.js
@@ -12,15 +12,9 @@ description: >
     'strict mode' using a FunctionExpression and the function has
     three identical parameters
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("var _13_1_10_fun = function (param, param, param) { };")
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-11-s.js b/test/language/statements/function/13.1-11-s.js
index 4d64d256d2..f518e3e3ec 100644
--- a/test/language/statements/function/13.1-11-s.js
+++ b/test/language/statements/function/13.1-11-s.js
@@ -7,15 +7,9 @@ description: >
     StrictMode - SyntaxError is thrown if 'eval' occurs as the
     function name of a FunctionDeclaration in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("function eval() { };")
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-12-s.js b/test/language/statements/function/13.1-12-s.js
index 8f0e24d6f1..9ab5a3d727 100644
--- a/test/language/statements/function/13.1-12-s.js
+++ b/test/language/statements/function/13.1-12-s.js
@@ -7,17 +7,9 @@ description: >
     StrictMode - SyntaxError is thrown if 'eval' occurs as the
     Identifier of a FunctionExpression in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var _13_1_12_s = {};
-
-        try {
+assert.throws(SyntaxError, function() {
             eval("_13_1_12_s.x = function eval() {};");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-13-s.js b/test/language/statements/function/13.1-13-s.js
index 290904800b..ca42171704 100644
--- a/test/language/statements/function/13.1-13-s.js
+++ b/test/language/statements/function/13.1-13-s.js
@@ -7,15 +7,9 @@ description: >
     StrictMode - SyntaxError is thrown if 'arguments' occurs as the
     function name of a FunctionDeclaration in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("function arguments() { };")
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-14-s.js b/test/language/statements/function/13.1-14-s.js
index d639eb202c..902419038b 100644
--- a/test/language/statements/function/13.1-14-s.js
+++ b/test/language/statements/function/13.1-14-s.js
@@ -7,17 +7,9 @@ description: >
     StrictMode - SyntaxError is thrown if 'arguments' occurs as the
     Identifier of a FunctionExpression in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var _13_1_14_s = {};
-
-        try {
+assert.throws(SyntaxError, function() {
             eval("_13_1_14_s.x = function arguments() {};");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-15-s.js b/test/language/statements/function/13.1-15-s.js
index 1ee28524d8..6d47b948d7 100644
--- a/test/language/statements/function/13.1-15-s.js
+++ b/test/language/statements/function/13.1-15-s.js
@@ -12,16 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionDeclaration in strict eval code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict';function _13_1_15_fun(eval) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-16-s.js b/test/language/statements/function/13.1-16-s.js
index 0522c9b1eb..a2e2c4999d 100644
--- a/test/language/statements/function/13.1-16-s.js
+++ b/test/language/statements/function/13.1-16-s.js
@@ -12,16 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionDeclaration when FuctionBody is strict code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("function _13_1_16_fun(eval) { 'use strict'; }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-17-s.js b/test/language/statements/function/13.1-17-s.js
index 6d1dd8dcd4..9c08d09341 100644
--- a/test/language/statements/function/13.1-17-s.js
+++ b/test/language/statements/function/13.1-17-s.js
@@ -12,16 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionExpression in strict eval code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; var _13_1_17_fun = function (eval) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-18-s.js b/test/language/statements/function/13.1-18-s.js
index 92a0c07fdf..1ff8d86997 100644
--- a/test/language/statements/function/13.1-18-s.js
+++ b/test/language/statements/function/13.1-18-s.js
@@ -12,16 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionExpression when FuctionBody is strict code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("var _13_1_18_fun = function (eval) { 'use strict'; }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-19-s.js b/test/language/statements/function/13.1-19-s.js
index 5cbf661565..3dce5196fe 100644
--- a/test/language/statements/function/13.1-19-s.js
+++ b/test/language/statements/function/13.1-19-s.js
@@ -12,16 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionDeclaration in strict eval code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict';function _13_1_19_fun(arguments) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-2-s.js b/test/language/statements/function/13.1-2-s.js
index dfda3645f5..07a657bd37 100644
--- a/test/language/statements/function/13.1-2-s.js
+++ b/test/language/statements/function/13.1-2-s.js
@@ -12,15 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionExpression
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("var _13_1_2_fun = function (eval) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-20-s.js b/test/language/statements/function/13.1-20-s.js
index 44265dbb99..8c57d7a622 100644
--- a/test/language/statements/function/13.1-20-s.js
+++ b/test/language/statements/function/13.1-20-s.js
@@ -12,16 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionDeclaration when FuctionBody is strict code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("function _13_1_20_fun(arguments) { 'use strict'; }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-21-s.js b/test/language/statements/function/13.1-21-s.js
index cb4421f62b..4e79bace14 100644
--- a/test/language/statements/function/13.1-21-s.js
+++ b/test/language/statements/function/13.1-21-s.js
@@ -12,16 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionExpression in strict eval code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; var _13_1_21_fun = function (arguments) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-22-s.js b/test/language/statements/function/13.1-22-s.js
index 3243a96f24..ac3417cb86 100644
--- a/test/language/statements/function/13.1-22-s.js
+++ b/test/language/statements/function/13.1-22-s.js
@@ -12,16 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionExpression when FuctionBody is strict code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("var _13_1_22_fun = function (arguments) { 'use strict'; }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-23-s.js b/test/language/statements/function/13.1-23-s.js
index fedc7a3428..36008957f9 100644
--- a/test/language/statements/function/13.1-23-s.js
+++ b/test/language/statements/function/13.1-23-s.js
@@ -12,16 +12,9 @@ description: >
     a FunctionDeclaration that is contained in eval strict code and
     the function has two identical parameters
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; function _13_1_23_fun(param, param) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-24-s.js b/test/language/statements/function/13.1-24-s.js
index de66d85783..fc459cd93e 100644
--- a/test/language/statements/function/13.1-24-s.js
+++ b/test/language/statements/function/13.1-24-s.js
@@ -12,16 +12,9 @@ description: >
     a FunctionDeclaration whose FunctionBody is contained in strict
     code and the function has two identical parameters
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("function _13_1_24_fun(param, param) { 'use strict'; }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-25-s.js b/test/language/statements/function/13.1-25-s.js
index e470eb4ae6..7bc1c7b082 100644
--- a/test/language/statements/function/13.1-25-s.js
+++ b/test/language/statements/function/13.1-25-s.js
@@ -13,16 +13,9 @@ description: >
     the function has two identical parameters which are separated by a
     unique parameter name
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; function _13_1_25_fun(param1, param2, param1) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-26-s.js b/test/language/statements/function/13.1-26-s.js
index dd16e5f113..f44b944904 100644
--- a/test/language/statements/function/13.1-26-s.js
+++ b/test/language/statements/function/13.1-26-s.js
@@ -13,16 +13,9 @@ description: >
     code and the function has two identical parameters which are
     separated by a unique parameter name
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("function _13_1_26_fun(param1, param2, param1) { 'use strict'; }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-27-s.js b/test/language/statements/function/13.1-27-s.js
index b9cf0eb534..3ad0c92061 100644
--- a/test/language/statements/function/13.1-27-s.js
+++ b/test/language/statements/function/13.1-27-s.js
@@ -12,16 +12,9 @@ description: >
     a FunctionDeclaration that is contained in eval strict code and
     the function has three identical parameters
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; function _13_1_27_fun(param, param, param) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-28-s.js b/test/language/statements/function/13.1-28-s.js
index f87d2d1706..61d6e3f311 100644
--- a/test/language/statements/function/13.1-28-s.js
+++ b/test/language/statements/function/13.1-28-s.js
@@ -12,17 +12,9 @@ description: >
     a FunctionDeclaration whose FunctionBody is contained in strict
     code and the function has three identical parameters
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("function _13_1_28_fun(param, param, param) { 'use strict'; }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-29-s.js b/test/language/statements/function/13.1-29-s.js
index 9c0cc7171b..0dd41865e6 100644
--- a/test/language/statements/function/13.1-29-s.js
+++ b/test/language/statements/function/13.1-29-s.js
@@ -12,16 +12,9 @@ description: >
     a FunctionExpression that is contained in eval strict code and the
     function has two identical parameters
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; var _13_1_29_fun = function (param, param) { };");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-3-s.js b/test/language/statements/function/13.1-3-s.js
index baa9c16c43..803e5986c2 100644
--- a/test/language/statements/function/13.1-3-s.js
+++ b/test/language/statements/function/13.1-3-s.js
@@ -12,15 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionDeclaration
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("function _13_1_3_fun(arguments) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-30-s.js b/test/language/statements/function/13.1-30-s.js
index 0fbae1edeb..d7fa8d644f 100644
--- a/test/language/statements/function/13.1-30-s.js
+++ b/test/language/statements/function/13.1-30-s.js
@@ -12,16 +12,9 @@ description: >
     a FunctionExpression whose FunctionBody is contained in strict
     code and the function has two identical parameters
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("var _13_1_30_fun = function (param, param) { 'use strict'; };");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-31-s.js b/test/language/statements/function/13.1-31-s.js
index 4aba0e0542..911588b633 100644
--- a/test/language/statements/function/13.1-31-s.js
+++ b/test/language/statements/function/13.1-31-s.js
@@ -13,16 +13,9 @@ description: >
     function has two identical parameters, which are separated by a
     unique parameter name
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; var _13_1_31_fun = function (param1, param2, param1) { };");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-32-s.js b/test/language/statements/function/13.1-32-s.js
index e46f50f783..486c553919 100644
--- a/test/language/statements/function/13.1-32-s.js
+++ b/test/language/statements/function/13.1-32-s.js
@@ -13,16 +13,9 @@ description: >
     has two identical parameters, which are separated by a unique
     parameter name
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("var _13_1_32_fun = function (param1, param2, param1) { 'use strict'; };");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-33-s.js b/test/language/statements/function/13.1-33-s.js
index 3d9b311287..cdccca76ad 100644
--- a/test/language/statements/function/13.1-33-s.js
+++ b/test/language/statements/function/13.1-33-s.js
@@ -12,16 +12,9 @@ description: >
     FunctionExpression that is contained in eval strict code and the
     function has three identical parameters
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; var _13_1_33_fun = function (param, param, param) { };")
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-34-s.js b/test/language/statements/function/13.1-34-s.js
index 4bedc59919..e3d9c6f400 100644
--- a/test/language/statements/function/13.1-34-s.js
+++ b/test/language/statements/function/13.1-34-s.js
@@ -11,16 +11,9 @@ description: >
     Strict Mode - SyntaxError is thrown if a function declaration has
     three identical parameters with a strict mode body
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("var _13_1_34_fun = function (param, param, param) { 'use strict'; };")
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-35-s.js b/test/language/statements/function/13.1-35-s.js
index 53f6bb730d..ca9376953a 100644
--- a/test/language/statements/function/13.1-35-s.js
+++ b/test/language/statements/function/13.1-35-s.js
@@ -7,16 +7,9 @@ description: >
     StrictMode - SyntaxError is thrown if 'eval' occurs as the
     function name of a FunctionDeclaration in strict eval code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; function eval() { };")
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-36-s.js b/test/language/statements/function/13.1-36-s.js
index 0d09fef4e9..ce5c98ec0d 100644
--- a/test/language/statements/function/13.1-36-s.js
+++ b/test/language/statements/function/13.1-36-s.js
@@ -8,16 +8,9 @@ description: >
     function name of a FunctionDeclaration whose FunctionBody is in
     strict mode
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("function eval() { 'use strict'; };")
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-37-s.js b/test/language/statements/function/13.1-37-s.js
index 031782a57b..5b2c1db6b4 100644
--- a/test/language/statements/function/13.1-37-s.js
+++ b/test/language/statements/function/13.1-37-s.js
@@ -7,16 +7,9 @@ description: >
     StrictMode - SyntaxError is thrown if 'eval' occurs as the
     Identifier of a FunctionExpression in strict eval code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var _13_1_37_s = {};
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; _13_1_37_s.x = function eval() {};");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-38-s.js b/test/language/statements/function/13.1-38-s.js
index bc5c1a49e5..ac4db793dd 100644
--- a/test/language/statements/function/13.1-38-s.js
+++ b/test/language/statements/function/13.1-38-s.js
@@ -8,16 +8,9 @@ description: >
     Identifier of a FunctionExpression whose FunctionBody is contained
     in strict code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var _13_1_38_s = {};
-        try {
+assert.throws(SyntaxError, function() {
             eval("_13_1_38_s.x = function eval() {'use strict'; };");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-39-s.js b/test/language/statements/function/13.1-39-s.js
index bdbde71c60..633be9641d 100644
--- a/test/language/statements/function/13.1-39-s.js
+++ b/test/language/statements/function/13.1-39-s.js
@@ -7,16 +7,9 @@ description: >
     StrictMode - SyntaxError is thrown if 'arguments' occurs as the
     function name of a FunctionDeclaration in strict eval code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; function arguments() { };")
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-4-s.js b/test/language/statements/function/13.1-4-s.js
index 71729cf40e..092aaee0df 100644
--- a/test/language/statements/function/13.1-4-s.js
+++ b/test/language/statements/function/13.1-4-s.js
@@ -12,15 +12,9 @@ description: >
     appears within a FormalParameterList of a strict mode
     FunctionExpression
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("var _13_1_4_fun = function (arguments) { };");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-40-s.js b/test/language/statements/function/13.1-40-s.js
index d29ce3e5d3..8c77046075 100644
--- a/test/language/statements/function/13.1-40-s.js
+++ b/test/language/statements/function/13.1-40-s.js
@@ -8,16 +8,9 @@ description: >
     Identifier of a FunctionDeclaration whose FunctionBody is
     contained in strict code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-        try {
+assert.throws(SyntaxError, function() {
             eval("function arguments() { 'use strict'; };")
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-41-s.js b/test/language/statements/function/13.1-41-s.js
index f59b4aeb07..a6e246177a 100644
--- a/test/language/statements/function/13.1-41-s.js
+++ b/test/language/statements/function/13.1-41-s.js
@@ -7,16 +7,9 @@ description: >
     StrictMode - SyntaxError is thrown if 'arguments' occurs as the
     Identifier of a FunctionExpression in strict eval code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var _13_1_41_s = {};
-        try {
+assert.throws(SyntaxError, function() {
             eval("'use strict'; _13_1_41_s.x = function arguments() {};");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-42-s.js b/test/language/statements/function/13.1-42-s.js
index eee56516fe..8e9a3fccb8 100644
--- a/test/language/statements/function/13.1-42-s.js
+++ b/test/language/statements/function/13.1-42-s.js
@@ -8,16 +8,9 @@ description: >
     Identifier of a FunctionExpression whose FunctionBody is contained
     in strict code
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var _13_1_42_s = {};
-        try {
+assert.throws(SyntaxError, function() {
             eval("_13_1_42_s.x = function arguments() {'use strict';};");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-5-s.js b/test/language/statements/function/13.1-5-s.js
index a0dd7d482d..65a010a6c1 100644
--- a/test/language/statements/function/13.1-5-s.js
+++ b/test/language/statements/function/13.1-5-s.js
@@ -12,15 +12,9 @@ description: >
     'strict mode' using a FunctionDeclaration and the function has two
     identical parameters
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("function _13_1_5_fun(param, param) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-6-s.js b/test/language/statements/function/13.1-6-s.js
index 24f7542da2..d02d720914 100644
--- a/test/language/statements/function/13.1-6-s.js
+++ b/test/language/statements/function/13.1-6-s.js
@@ -13,15 +13,9 @@ description: >
     identical parameters, which are separated by a unique parameter
     name
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("function _13_1_6_fun(param1, param2, param1) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-7-s.js b/test/language/statements/function/13.1-7-s.js
index 64e4b17217..b42b13e823 100644
--- a/test/language/statements/function/13.1-7-s.js
+++ b/test/language/statements/function/13.1-7-s.js
@@ -12,15 +12,9 @@ description: >
     'strict mode' using a FunctionDeclaration and the function has
     three identical parameters
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("function _13_1_7_fun(param, param, param) { }");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-8-s.js b/test/language/statements/function/13.1-8-s.js
index 9ab6acd803..42f977405a 100644
--- a/test/language/statements/function/13.1-8-s.js
+++ b/test/language/statements/function/13.1-8-s.js
@@ -12,15 +12,9 @@ description: >
     'strict mode' using a FunctionExpression and the function has two
     identical parameters
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("var _13_1_8_fun = function (param, param) { };");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.1-9-s.js b/test/language/statements/function/13.1-9-s.js
index 551a6f61c7..a8284132c1 100644
--- a/test/language/statements/function/13.1-9-s.js
+++ b/test/language/statements/function/13.1-9-s.js
@@ -13,15 +13,9 @@ description: >
     identical parameters, which are separated by a unique parameter
     name
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("var _13_1_9_fun = function (param1, param2, param1) { };");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-10-s.js b/test/language/statements/function/13.2-10-s.js
index 4687488f61..6cefcc79d7 100644
--- a/test/language/statements/function/13.2-10-s.js
+++ b/test/language/statements/function/13.2-10-s.js
@@ -6,17 +6,9 @@ es5id: 13.2-10-s
 description: >
     StrictMode - writing a property named 'caller' of function objects
     is not allowed outside the function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var foo = Function("'use strict';");
-        try {
+assert.throws(TypeError, function() {
             foo.caller = 41;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-13-s.js b/test/language/statements/function/13.2-13-s.js
index ae3d1800f1..3fb244f9e1 100644
--- a/test/language/statements/function/13.2-13-s.js
+++ b/test/language/statements/function/13.2-13-s.js
@@ -6,17 +6,9 @@ es5id: 13.2-13-s
 description: >
     StrictMode - reading a property named 'arguments' of function
     objects is not allowed outside the function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var foo = new Function("'use strict';");
-        try {
+assert.throws(TypeError, function() {
             var temp = foo.arguments;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-14-s.js b/test/language/statements/function/13.2-14-s.js
index 08e623791e..06073a4bd7 100644
--- a/test/language/statements/function/13.2-14-s.js
+++ b/test/language/statements/function/13.2-14-s.js
@@ -6,17 +6,9 @@ es5id: 13.2-14-s
 description: >
     StrictMode - writing a property named 'arguments' of function
     objects is not allowed outside the function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var foo = new Function("'use strict';");
-        try {
+assert.throws(TypeError, function() {
             foo.arguments = 41;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-17-s.js b/test/language/statements/function/13.2-17-s.js
index 5354731b2b..df7a22e2e1 100644
--- a/test/language/statements/function/13.2-17-s.js
+++ b/test/language/statements/function/13.2-17-s.js
@@ -6,17 +6,9 @@ es5id: 13.2-17-s
 description: >
     StrictMode - reading a property named 'arguments' of function
     objects is not allowed outside the function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var foo = Function("'use strict';");
-        try {
+assert.throws(TypeError, function() {
             var temp = foo.arguments;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-18-s.js b/test/language/statements/function/13.2-18-s.js
index 6ea8865190..77b6467227 100644
--- a/test/language/statements/function/13.2-18-s.js
+++ b/test/language/statements/function/13.2-18-s.js
@@ -6,17 +6,9 @@ es5id: 13.2-18-s
 description: >
     StrictMode - writing a property named 'arguments' of function
     objects is not allowed outside the function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var foo = Function("'use strict';");
-        try {
+assert.throws(TypeError, function() {
             foo.arguments = 41;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-2-s.js b/test/language/statements/function/13.2-2-s.js
index d47478316c..77e670e9f1 100644
--- a/test/language/statements/function/13.2-2-s.js
+++ b/test/language/statements/function/13.2-2-s.js
@@ -7,17 +7,11 @@ description: >
     StrictMode - A TypeError is thrown when a strict mode code writes
     to properties named 'caller' of function instances.
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(TypeError, function() {
             var foo = function () {
             }
             foo.caller = 20;
-            return false;
-        } catch (ex) {
-            return ex instanceof TypeError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-21-s.js b/test/language/statements/function/13.2-21-s.js
index c7b5ac37b8..34b13e98ae 100644
--- a/test/language/statements/function/13.2-21-s.js
+++ b/test/language/statements/function/13.2-21-s.js
@@ -7,17 +7,9 @@ description: >
     StrictMode - reading a property named 'caller' of function objects
     is not allowed outside the function
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         function foo () {"use strict";}
-        try {
+assert.throws(TypeError, function() {
             var temp = foo.caller;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-22-s.js b/test/language/statements/function/13.2-22-s.js
index 55a1a34a32..a3955d8710 100644
--- a/test/language/statements/function/13.2-22-s.js
+++ b/test/language/statements/function/13.2-22-s.js
@@ -7,17 +7,9 @@ description: >
     StrictMode - writing a property named 'caller' of function objects
     is not allowed outside the function
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         function foo () {"use strict";}
-        try {
+assert.throws(TypeError, function() {
             foo.caller = 41;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-25-s.js b/test/language/statements/function/13.2-25-s.js
index 0590659765..b4a46bd72f 100644
--- a/test/language/statements/function/13.2-25-s.js
+++ b/test/language/statements/function/13.2-25-s.js
@@ -7,17 +7,9 @@ description: >
     StrictMode - reading a property named 'arguments' of function
     objects is not allowed outside the function
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         function foo () {"use strict";}
-        try {
+assert.throws(TypeError, function() {
             var temp = foo.arguments;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-26-s.js b/test/language/statements/function/13.2-26-s.js
index 33f2f1840d..371af059c7 100644
--- a/test/language/statements/function/13.2-26-s.js
+++ b/test/language/statements/function/13.2-26-s.js
@@ -7,17 +7,9 @@ description: >
     StrictMode - writing a property named 'arguments' of function
     objects is not allowed outside the function
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         function foo () {"use strict";}
-        try {
+assert.throws(TypeError, function() {
             foo.arguments = 41;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-4-s.js b/test/language/statements/function/13.2-4-s.js
index 68a1b0a7a5..8ff3f336fc 100644
--- a/test/language/statements/function/13.2-4-s.js
+++ b/test/language/statements/function/13.2-4-s.js
@@ -7,17 +7,11 @@ description: >
     StrictMode - A TypeError is thrown when a code in strict mode
     tries to write to 'arguments' of function instances.
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(TypeError, function() {
             var foo = function () {
             }
             foo.arguments = 20;
-            return false;
-        } catch (ex) {
-            return ex instanceof TypeError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-5-s.js b/test/language/statements/function/13.2-5-s.js
index 2000a44488..a617e305bb 100644
--- a/test/language/statements/function/13.2-5-s.js
+++ b/test/language/statements/function/13.2-5-s.js
@@ -7,17 +7,9 @@ description: >
     StrictMode - reading a property named 'caller' of function objects
     is not allowed outside the function
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var foo = new Function("'use strict';");
-        try {
+assert.throws(TypeError, function() {
             var temp = foo.caller;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-6-s.js b/test/language/statements/function/13.2-6-s.js
index d751d08041..ffe989f44d 100644
--- a/test/language/statements/function/13.2-6-s.js
+++ b/test/language/statements/function/13.2-6-s.js
@@ -7,17 +7,9 @@ description: >
     StrictMode - writing a property named 'caller' of function objects
     is not allowed outside the function
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var foo = new Function("'use strict';");
-        try {
+assert.throws(TypeError, function() {
             foo.caller = 41;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/function/13.2-9-s.js b/test/language/statements/function/13.2-9-s.js
index 9594fbb112..756d0e1a21 100644
--- a/test/language/statements/function/13.2-9-s.js
+++ b/test/language/statements/function/13.2-9-s.js
@@ -7,17 +7,9 @@ description: >
     StrictMode - reading a property named 'caller' of function objects
     is not allowed outside the function
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var foo = Function("'use strict';");
-        try {
+assert.throws(TypeError, function() {
             var temp = foo.caller;
-            return false;
-        }
-        catch (e) {
-            return e instanceof TypeError;
-        }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/try/12.14.1-1-s.js b/test/language/statements/try/12.14.1-1-s.js
index e88f976ae7..688e10439d 100644
--- a/test/language/statements/try/12.14.1-1-s.js
+++ b/test/language/statements/try/12.14.1-1-s.js
@@ -8,17 +8,10 @@ description: >
     occurs within strict code and the Identifier of the Catch
     production is eval
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+assert.throws(SyntaxError, function() {
             eval("\
                    try {} catch (eval) { }\
             ");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/try/12.14.1-2-s.js b/test/language/statements/try/12.14.1-2-s.js
index 0fe35a9995..7977218340 100644
--- a/test/language/statements/try/12.14.1-2-s.js
+++ b/test/language/statements/try/12.14.1-2-s.js
@@ -8,17 +8,10 @@ description: >
     occurs within strict code and the Identifier of the Catch
     production is arguments
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+assert.throws(SyntaxError, function() {
             eval("\
                    try {} catch (arguments) { }\
             ");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/try/12.14.1-3-s.js b/test/language/statements/try/12.14.1-3-s.js
index 29e75f7ceb..7223984812 100644
--- a/test/language/statements/try/12.14.1-3-s.js
+++ b/test/language/statements/try/12.14.1-3-s.js
@@ -8,11 +8,10 @@ description: >
     Catch occurs within strict code and the Identifier of the Catch
     production is EVAL but throws SyntaxError if it is eval
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-       try{ eval(" try { \
+assert.throws(SyntaxError, function() {
+ eval(" try { \
              throw new Error(\"...\");\
              return false;\
          } catch (EVAL) {\
@@ -24,9 +23,4 @@ function testcase() {
                  return EVAL instanceof Error;\
               }\
          }");
-         return false;
-        } catch(e) {
-             return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-1-s.js b/test/language/statements/variable/12.2.1-1-s.js
index 448ebb28b6..bdf44cea2b 100644
--- a/test/language/statements/variable/12.2.1-1-s.js
+++ b/test/language/statements/variable/12.2.1-1-s.js
@@ -7,16 +7,9 @@ description: >
     eval - a function declaring a var named 'eval' throws SyntaxError
     in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var eval; }');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-12-s.js b/test/language/statements/variable/12.2.1-12-s.js
index 8028f64738..50ffbfef3c 100644
--- a/test/language/statements/variable/12.2.1-12-s.js
+++ b/test/language/statements/variable/12.2.1-12-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-12-s
 description: arguments as local var identifier throws SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var arguments;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-13-s.js b/test/language/statements/variable/12.2.1-13-s.js
index 8de3ada3ff..5e9fc3a6d5 100644
--- a/test/language/statements/variable/12.2.1-13-s.js
+++ b/test/language/statements/variable/12.2.1-13-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-13-s
 description: arguments assignment throws SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { arguments = 42; }; foo()');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-14-s.js b/test/language/statements/variable/12.2.1-14-s.js
index 0f43c2824b..06cf5eba8d 100644
--- a/test/language/statements/variable/12.2.1-14-s.js
+++ b/test/language/statements/variable/12.2.1-14-s.js
@@ -7,16 +7,9 @@ description: >
     arguments - a function expr declaring a var named 'arguments'
     throws SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('(function (){var arguments;});');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-15-s.js b/test/language/statements/variable/12.2.1-15-s.js
index 2da7a85230..8447267316 100644
--- a/test/language/statements/variable/12.2.1-15-s.js
+++ b/test/language/statements/variable/12.2.1-15-s.js
@@ -7,16 +7,9 @@ description: >
     arguments - a function expr assigning into 'arguments' throws a
     SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('(function () {arguments = 42;})()');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-18-s.js b/test/language/statements/variable/12.2.1-18-s.js
index 6e8c15b00d..88e1327365 100644
--- a/test/language/statements/variable/12.2.1-18-s.js
+++ b/test/language/statements/variable/12.2.1-18-s.js
@@ -7,16 +7,9 @@ description: >
     A direct eval declaring a var named 'arguments' throws SyntaxError
     in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('var arguments;');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-19-s.js b/test/language/statements/variable/12.2.1-19-s.js
index fd73916ddb..e750197fc3 100644
--- a/test/language/statements/variable/12.2.1-19-s.js
+++ b/test/language/statements/variable/12.2.1-19-s.js
@@ -7,16 +7,9 @@ description: >
     A direct eval assigning into 'arguments' throws SyntaxError in
     strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('arguments = 42;');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError) ;
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-2-s.js b/test/language/statements/variable/12.2.1-2-s.js
index d2e96976c7..40da7f8923 100644
--- a/test/language/statements/variable/12.2.1-2-s.js
+++ b/test/language/statements/variable/12.2.1-2-s.js
@@ -7,16 +7,9 @@ description: >
     eval - a function assigning into 'eval' throws SyntaxError in
     strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { eval = 42; }; foo()');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-22-s.js b/test/language/statements/variable/12.2.1-22-s.js
index f84c20578c..4c737c6af5 100644
--- a/test/language/statements/variable/12.2.1-22-s.js
+++ b/test/language/statements/variable/12.2.1-22-s.js
@@ -6,19 +6,9 @@ es5id: 12.2.1-22-s
 description: >
     arguments as global var identifier throws SyntaxError in strict
     mode
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var indirectEval = eval;
-	
-    try {
+assert.throws(SyntaxError, function() {
 	    indirectEval("'use strict'; var arguments;");
-        return false;
-	}
-    catch (e) {
-        return (e instanceof SyntaxError);
-	}
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-23-s.js b/test/language/statements/variable/12.2.1-23-s.js
index 3ee332933e..45e3912de7 100644
--- a/test/language/statements/variable/12.2.1-23-s.js
+++ b/test/language/statements/variable/12.2.1-23-s.js
@@ -7,16 +7,9 @@ description: >
     arguments as local var identifier assigned to throws SyntaxError
     in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var arguments = 42;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-24-s.js b/test/language/statements/variable/12.2.1-24-s.js
index bac5088214..8e5818b107 100644
--- a/test/language/statements/variable/12.2.1-24-s.js
+++ b/test/language/statements/variable/12.2.1-24-s.js
@@ -7,16 +7,9 @@ description: >
     eval as local var identifier assigned to throws SyntaxError in
     strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var eval = 42;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-25-s.js b/test/language/statements/variable/12.2.1-25-s.js
index 826afe7a97..95712e37f4 100644
--- a/test/language/statements/variable/12.2.1-25-s.js
+++ b/test/language/statements/variable/12.2.1-25-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-25-s
 description: arguments as local var identifier throws SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var arguments, a;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-26-s.js b/test/language/statements/variable/12.2.1-26-s.js
index a12e454ffb..427689845b 100644
--- a/test/language/statements/variable/12.2.1-26-s.js
+++ b/test/language/statements/variable/12.2.1-26-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-26-s
 description: eval as local var identifier throws SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var a, eval;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-27-s.js b/test/language/statements/variable/12.2.1-27-s.js
index cf6bbad494..51b3bc1b32 100644
--- a/test/language/statements/variable/12.2.1-27-s.js
+++ b/test/language/statements/variable/12.2.1-27-s.js
@@ -7,16 +7,9 @@ description: >
     eval as local var identifier assigned to throws SyntaxError in
     strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var eval = 42, a;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-28-s.js b/test/language/statements/variable/12.2.1-28-s.js
index fcf7156af5..c06f66b58c 100644
--- a/test/language/statements/variable/12.2.1-28-s.js
+++ b/test/language/statements/variable/12.2.1-28-s.js
@@ -7,16 +7,9 @@ description: >
     arguments as local var identifier assigned to throws SyntaxError
     in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var a, arguments = 42;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-29-s.js b/test/language/statements/variable/12.2.1-29-s.js
index 3470528578..f188ae7196 100644
--- a/test/language/statements/variable/12.2.1-29-s.js
+++ b/test/language/statements/variable/12.2.1-29-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-29-s
 description: eval as local var identifier throws SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var eval, a = 42;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-3-s.js b/test/language/statements/variable/12.2.1-3-s.js
index 75d700f5e0..19166749a4 100644
--- a/test/language/statements/variable/12.2.1-3-s.js
+++ b/test/language/statements/variable/12.2.1-3-s.js
@@ -7,16 +7,9 @@ description: >
     eval - a function expr declaring a var named 'eval' throws
     SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('(function () { var eval; })');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-30-s.js b/test/language/statements/variable/12.2.1-30-s.js
index d66da4f82c..2fb229dda0 100644
--- a/test/language/statements/variable/12.2.1-30-s.js
+++ b/test/language/statements/variable/12.2.1-30-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-30-s
 description: arguments as local var identifier throws SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var a = 42, arguments;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-31-s.js b/test/language/statements/variable/12.2.1-31-s.js
index 7b45601ba5..937313d894 100644
--- a/test/language/statements/variable/12.2.1-31-s.js
+++ b/test/language/statements/variable/12.2.1-31-s.js
@@ -7,16 +7,9 @@ description: >
     eval as local var identifier defined twice throws SyntaxError in
     strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var eval, eval;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-32-s.js b/test/language/statements/variable/12.2.1-32-s.js
index b0b17ce060..12326d08bf 100644
--- a/test/language/statements/variable/12.2.1-32-s.js
+++ b/test/language/statements/variable/12.2.1-32-s.js
@@ -7,16 +7,9 @@ description: >
     arguments as local var identifier defined twice and assigned once
     throws SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var arguments, arguments = 42;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-33-s.js b/test/language/statements/variable/12.2.1-33-s.js
index 188ec75458..0b474dd519 100644
--- a/test/language/statements/variable/12.2.1-33-s.js
+++ b/test/language/statements/variable/12.2.1-33-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-33-s
 description: arguments as local var identifier throws SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('function foo() { var a, arguments, b;}');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
-}
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-34-s.js b/test/language/statements/variable/12.2.1-34-s.js
index 2cdf1495bc..c7794514a1 100644
--- a/test/language/statements/variable/12.2.1-34-s.js
+++ b/test/language/statements/variable/12.2.1-34-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-34-s
 description: "'for(var eval in ...) {...}' throws SyntaxError in strict mode"
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('for (var eval in null) {};');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-35-s.js b/test/language/statements/variable/12.2.1-35-s.js
index c9f4064230..5d8d17ce55 100644
--- a/test/language/statements/variable/12.2.1-35-s.js
+++ b/test/language/statements/variable/12.2.1-35-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-35-s
 description: "'for(var eval = 42 in ...) {...}' throws SyntaxError in strict mode"
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('for (var eval = 42 in null) {};');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-36-s.js b/test/language/statements/variable/12.2.1-36-s.js
index de1dcab519..872d7c7c2a 100644
--- a/test/language/statements/variable/12.2.1-36-s.js
+++ b/test/language/statements/variable/12.2.1-36-s.js
@@ -5,16 +5,9 @@
 es5id: 12.2.1-36-s
 description: "'for(var arguments in ...) {...}' throws SyntaxError in strict mode"
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('for (var arguments in null) {};');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-37-s.js b/test/language/statements/variable/12.2.1-37-s.js
index 6e81d9702c..cf7227e630 100644
--- a/test/language/statements/variable/12.2.1-37-s.js
+++ b/test/language/statements/variable/12.2.1-37-s.js
@@ -7,16 +7,9 @@ description: >
     'for(var arguments = 42 in ...) {...}' throws SyntaxError in
     strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('for (var arguments = 42 in null) {};');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-4-s.js b/test/language/statements/variable/12.2.1-4-s.js
index ccdeec6ce7..00fbcde7f8 100644
--- a/test/language/statements/variable/12.2.1-4-s.js
+++ b/test/language/statements/variable/12.2.1-4-s.js
@@ -7,16 +7,9 @@ description: >
     eval - a function expr assigning into 'eval' throws a SyntaxError
     in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('(function () { eval = 42; })()');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-7-s.js b/test/language/statements/variable/12.2.1-7-s.js
index 2f16e64b4e..723c5d221c 100644
--- a/test/language/statements/variable/12.2.1-7-s.js
+++ b/test/language/statements/variable/12.2.1-7-s.js
@@ -7,16 +7,9 @@ description: >
     eval - a direct eval declaring a var named 'eval' throws
     SyntaxError in strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('var eval;');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/variable/12.2.1-8-s.js b/test/language/statements/variable/12.2.1-8-s.js
index 5156674d83..aa75ccea96 100644
--- a/test/language/statements/variable/12.2.1-8-s.js
+++ b/test/language/statements/variable/12.2.1-8-s.js
@@ -7,16 +7,9 @@ description: >
     eval - a direct eval assigning into 'eval' throws SyntaxError in
     strict mode
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval('eval = 42;');
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError) ;
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-1-s.js b/test/language/statements/with/12.10.1-1-s.js
index 634e2ffda1..1407711469 100644
--- a/test/language/statements/with/12.10.1-1-s.js
+++ b/test/language/statements/with/12.10.1-1-s.js
@@ -5,12 +5,10 @@
 es5id: 12.10.1-1-s
 description: with statement in strict mode throws SyntaxError (strict function)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
 
-  try {
+assert.throws(SyntaxError, function() {
     // wrapping it in eval since this needs to be a syntax error. The
     // exception thrown must be a SyntaxError exception.
     eval("\
@@ -20,10 +18,4 @@ function testcase() {
             with (o) {};\
           }\
         ");
-    return false;
-  }
-  catch (e) {
-    return(e instanceof SyntaxError); 
-	}
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-10-s.js b/test/language/statements/with/12.10.1-10-s.js
index 00b713824d..49553bee72 100644
--- a/test/language/statements/with/12.10.1-10-s.js
+++ b/test/language/statements/with/12.10.1-10-s.js
@@ -7,22 +7,14 @@ description: >
     with statement in strict mode throws SyntaxError (eval, where the
     container function is strict)
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   // wrapping it in eval since this needs to be a syntax error. The
   // exception thrown must be a SyntaxError exception. Note that eval
   // inherits the strictness of its calling context.  
-  try {
+assert.throws(SyntaxError, function() {
     eval("\
           var o = {};\
           with (o) {}\
        ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-11-s.js b/test/language/statements/with/12.10.1-11-s.js
index 5d03b9f6e7..1b4e2e1f3e 100644
--- a/test/language/statements/with/12.10.1-11-s.js
+++ b/test/language/statements/with/12.10.1-11-s.js
@@ -7,16 +7,9 @@ description: >
     Strict Mode - SyntaxError is thrown when using WithStatement in
     strict mode code
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
-            eval("with ({}) { throw new Error();}");
 
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+assert.throws(SyntaxError, function() {
+            eval("with ({}) { throw new Error();}");
+});
diff --git a/test/language/statements/with/12.10.1-12-s.js b/test/language/statements/with/12.10.1-12-s.js
index c6a1cc6c0d..fe450fac80 100644
--- a/test/language/statements/with/12.10.1-12-s.js
+++ b/test/language/statements/with/12.10.1-12-s.js
@@ -5,20 +5,13 @@
 es5id: 12.10.1-12-s
 description: with statement in strict mode throws SyntaxError (strict eval)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval("\
           'use strict'; \
           var o = {}; \
           with (o) {}\
         ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError) ;
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-14-s.js b/test/language/statements/with/12.10.1-14-s.js
index 0078f12366..8c825e74b8 100644
--- a/test/language/statements/with/12.10.1-14-s.js
+++ b/test/language/statements/with/12.10.1-14-s.js
@@ -7,16 +7,9 @@ description: >
     Strict Mode - SyntaxError is thrown when the getter of a literal
     object utilizes WithStatement
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
-            eval("var obj = { get(a) { with(a){} } }; ");
 
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+assert.throws(SyntaxError, function() {
+            eval("var obj = { get(a) { with(a){} } }; ");
+});
diff --git a/test/language/statements/with/12.10.1-15-s.js b/test/language/statements/with/12.10.1-15-s.js
index 7191936831..b552a9a762 100644
--- a/test/language/statements/with/12.10.1-15-s.js
+++ b/test/language/statements/with/12.10.1-15-s.js
@@ -7,15 +7,9 @@ description: >
     Strict Mode - SyntaxError is thrown when the RHS of a dot property
     assignment utilizes WithStatement
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("var obj = {}; obj.get = function (a) { with(a){} }; ");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-16-s.js b/test/language/statements/with/12.10.1-16-s.js
index 4bbd2d22bc..5fe63c58fa 100644
--- a/test/language/statements/with/12.10.1-16-s.js
+++ b/test/language/statements/with/12.10.1-16-s.js
@@ -7,15 +7,9 @@ description: >
     Strict Mode - SyntaxError is thrown when the RHS of an object
     indexer assignment utilizes WithStatement
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        try {
+
+assert.throws(SyntaxError, function() {
             eval("var obj = {}; obj['get'] = function (a) { with(a){} };  ");
-            return false;
-        } catch (e) {
-            return e instanceof SyntaxError;
-        }
-    }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-2-s.js b/test/language/statements/with/12.10.1-2-s.js
index 1fab7fe6d7..639f81413f 100644
--- a/test/language/statements/with/12.10.1-2-s.js
+++ b/test/language/statements/with/12.10.1-2-s.js
@@ -7,11 +7,10 @@ description: >
     with statement in strict mode throws SyntaxError (nested function
     where container is strict)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     // wrapping it in eval since this needs to be a syntax error. The
     // exception thrown must be a SyntaxError exception.
     eval("\
@@ -23,10 +22,4 @@ function testcase() {
             }\
           }\
         ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-3-s.js b/test/language/statements/with/12.10.1-3-s.js
index 1a186ff2dc..922d035960 100644
--- a/test/language/statements/with/12.10.1-3-s.js
+++ b/test/language/statements/with/12.10.1-3-s.js
@@ -7,11 +7,10 @@ description: >
     with statement in strict mode throws SyntaxError (nested strict
     function)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     // wrapping it in eval since this needs to be a syntax error. The
     // exception thrown must be a SyntaxError exception.
     eval("\
@@ -23,10 +22,4 @@ function testcase() {
                 }\
               }\
         ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-4-s.js b/test/language/statements/with/12.10.1-4-s.js
index 0a1a151fc7..04a25d49fb 100644
--- a/test/language/statements/with/12.10.1-4-s.js
+++ b/test/language/statements/with/12.10.1-4-s.js
@@ -5,21 +5,13 @@
 es5id: 12.10.1-4-s
 description: with statement in strict mode throws SyntaxError (strict Function)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     var f = Function("\
                       \'use strict\';  \
                       var o = {}; \
                       with (o) {};\
                     ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-	
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-7-s.js b/test/language/statements/with/12.10.1-7-s.js
index d51fb00137..35d562653d 100644
--- a/test/language/statements/with/12.10.1-7-s.js
+++ b/test/language/statements/with/12.10.1-7-s.js
@@ -8,20 +8,13 @@ description: >
     expression, where the container function is directly evaled from
     strict code)
 flags: [onlyStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval("var f = function () {\
                 var o = {}; \
                 with (o) {}; \
              }\
         ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-8-s.js b/test/language/statements/with/12.10.1-8-s.js
index 54779f38ce..3e1a8f5222 100644
--- a/test/language/statements/with/12.10.1-8-s.js
+++ b/test/language/statements/with/12.10.1-8-s.js
@@ -7,11 +7,10 @@ description: >
     with statement in strict mode throws SyntaxError (function
     expression, where the container Function is strict)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     Function("\
               \'use strict\'; \
               var f1 = function () {\
@@ -19,10 +18,4 @@ function testcase() {
                   with (o) {}; \
                 }\
             ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError);
-  }
- }
-runTestCase(testcase);
+});
diff --git a/test/language/statements/with/12.10.1-9-s.js b/test/language/statements/with/12.10.1-9-s.js
index d04d1f9079..614c0d6439 100644
--- a/test/language/statements/with/12.10.1-9-s.js
+++ b/test/language/statements/with/12.10.1-9-s.js
@@ -7,11 +7,10 @@ description: >
     with statement in strict mode throws SyntaxError (strict function
     expression)
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  try {
+
+assert.throws(SyntaxError, function() {
     eval("\
           var f = function () {\
                 \'use strict\';\
@@ -19,10 +18,4 @@ function testcase() {
                 with (o) {}; \
               }\
         ");
-    return false;
-  }
-  catch (e) {
-    return (e instanceof SyntaxError) ;
-  }
- }
-runTestCase(testcase);
+});