From 2fe6cac16a2dabfbe718ae8b6a9786910e19eba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 13 Aug 2015 17:32:43 +0200
Subject: [PATCH] Replace runTestCase with assert helpers
 [test/language/reserved-words]

---
 test/language/reserved-words/7.6.1-1-1.js  | 9 +--------
 test/language/reserved-words/7.6.1-1-10.js | 9 +--------
 test/language/reserved-words/7.6.1-1-11.js | 9 +--------
 test/language/reserved-words/7.6.1-1-12.js | 9 +--------
 test/language/reserved-words/7.6.1-1-13.js | 9 +--------
 test/language/reserved-words/7.6.1-1-14.js | 9 +--------
 test/language/reserved-words/7.6.1-1-15.js | 9 +--------
 test/language/reserved-words/7.6.1-1-16.js | 9 +--------
 test/language/reserved-words/7.6.1-1-2.js  | 9 +--------
 test/language/reserved-words/7.6.1-1-3.js  | 9 +--------
 test/language/reserved-words/7.6.1-1-4.js  | 9 +--------
 test/language/reserved-words/7.6.1-1-5.js  | 9 +--------
 test/language/reserved-words/7.6.1-1-6.js  | 9 +--------
 test/language/reserved-words/7.6.1-1-7.js  | 9 +--------
 test/language/reserved-words/7.6.1-1-8.js  | 9 +--------
 test/language/reserved-words/7.6.1-1-9.js  | 9 +--------
 test/language/reserved-words/7.6.1-2-1.js  | 9 +--------
 test/language/reserved-words/7.6.1-2-10.js | 9 +--------
 test/language/reserved-words/7.6.1-2-11.js | 9 +--------
 test/language/reserved-words/7.6.1-2-12.js | 9 +--------
 test/language/reserved-words/7.6.1-2-13.js | 9 +--------
 test/language/reserved-words/7.6.1-2-14.js | 9 +--------
 test/language/reserved-words/7.6.1-2-15.js | 9 +--------
 test/language/reserved-words/7.6.1-2-16.js | 9 +--------
 test/language/reserved-words/7.6.1-2-2.js  | 9 +--------
 test/language/reserved-words/7.6.1-2-3.js  | 9 +--------
 test/language/reserved-words/7.6.1-2-4.js  | 9 +--------
 test/language/reserved-words/7.6.1-2-5.js  | 9 +--------
 test/language/reserved-words/7.6.1-2-6.js  | 9 +--------
 test/language/reserved-words/7.6.1-2-7.js  | 9 +--------
 test/language/reserved-words/7.6.1-2-8.js  | 9 +--------
 test/language/reserved-words/7.6.1-2-9.js  | 9 +--------
 test/language/reserved-words/7.6.1-3-1.js  | 9 +--------
 test/language/reserved-words/7.6.1-3-10.js | 9 +--------
 test/language/reserved-words/7.6.1-3-11.js | 9 +--------
 test/language/reserved-words/7.6.1-3-12.js | 9 +--------
 test/language/reserved-words/7.6.1-3-13.js | 9 +--------
 test/language/reserved-words/7.6.1-3-14.js | 9 +--------
 test/language/reserved-words/7.6.1-3-15.js | 9 +--------
 test/language/reserved-words/7.6.1-3-16.js | 9 +--------
 test/language/reserved-words/7.6.1-3-2.js  | 9 +--------
 test/language/reserved-words/7.6.1-3-3.js  | 9 +--------
 test/language/reserved-words/7.6.1-3-4.js  | 9 +--------
 test/language/reserved-words/7.6.1-3-5.js  | 9 +--------
 test/language/reserved-words/7.6.1-3-6.js  | 9 +--------
 test/language/reserved-words/7.6.1-3-7.js  | 9 +--------
 test/language/reserved-words/7.6.1-3-8.js  | 9 +--------
 test/language/reserved-words/7.6.1-3-9.js  | 9 +--------
 test/language/reserved-words/7.6.1-4-1.js  | 9 +--------
 test/language/reserved-words/7.6.1-4-10.js | 9 +--------
 test/language/reserved-words/7.6.1-4-11.js | 9 +--------
 test/language/reserved-words/7.6.1-4-12.js | 9 +--------
 test/language/reserved-words/7.6.1-4-13.js | 9 +--------
 test/language/reserved-words/7.6.1-4-14.js | 9 +--------
 test/language/reserved-words/7.6.1-4-15.js | 9 +--------
 test/language/reserved-words/7.6.1-4-16.js | 9 +--------
 test/language/reserved-words/7.6.1-4-2.js  | 9 +--------
 test/language/reserved-words/7.6.1-4-3.js  | 9 +--------
 test/language/reserved-words/7.6.1-4-4.js  | 9 +--------
 test/language/reserved-words/7.6.1-4-5.js  | 9 +--------
 test/language/reserved-words/7.6.1-4-6.js  | 9 +--------
 test/language/reserved-words/7.6.1-4-7.js  | 9 +--------
 test/language/reserved-words/7.6.1-4-8.js  | 9 +--------
 test/language/reserved-words/7.6.1-4-9.js  | 9 +--------
 test/language/reserved-words/7.6.1-5-1.js  | 9 +--------
 test/language/reserved-words/7.6.1-5-10.js | 9 +--------
 test/language/reserved-words/7.6.1-5-11.js | 9 +--------
 test/language/reserved-words/7.6.1-5-12.js | 9 +--------
 test/language/reserved-words/7.6.1-5-13.js | 9 +--------
 test/language/reserved-words/7.6.1-5-14.js | 9 +--------
 test/language/reserved-words/7.6.1-5-15.js | 9 +--------
 test/language/reserved-words/7.6.1-5-16.js | 9 +--------
 test/language/reserved-words/7.6.1-5-2.js  | 9 +--------
 test/language/reserved-words/7.6.1-5-3.js  | 9 +--------
 test/language/reserved-words/7.6.1-5-4.js  | 9 +--------
 test/language/reserved-words/7.6.1-5-5.js  | 9 +--------
 test/language/reserved-words/7.6.1-5-6.js  | 9 +--------
 test/language/reserved-words/7.6.1-5-7.js  | 9 +--------
 test/language/reserved-words/7.6.1-5-8.js  | 9 +--------
 test/language/reserved-words/7.6.1-5-9.js  | 9 +--------
 test/language/reserved-words/7.6.1-6-1.js  | 9 +--------
 test/language/reserved-words/7.6.1-6-10.js | 9 +--------
 test/language/reserved-words/7.6.1-6-11.js | 9 +--------
 test/language/reserved-words/7.6.1-6-12.js | 9 +--------
 test/language/reserved-words/7.6.1-6-13.js | 9 +--------
 test/language/reserved-words/7.6.1-6-14.js | 9 +--------
 test/language/reserved-words/7.6.1-6-15.js | 9 +--------
 test/language/reserved-words/7.6.1-6-16.js | 9 +--------
 test/language/reserved-words/7.6.1-6-2.js  | 9 +--------
 test/language/reserved-words/7.6.1-6-3.js  | 9 +--------
 test/language/reserved-words/7.6.1-6-4.js  | 9 +--------
 test/language/reserved-words/7.6.1-6-5.js  | 9 +--------
 test/language/reserved-words/7.6.1-6-6.js  | 9 +--------
 test/language/reserved-words/7.6.1-6-7.js  | 9 +--------
 test/language/reserved-words/7.6.1-6-8.js  | 9 +--------
 test/language/reserved-words/7.6.1-6-9.js  | 9 +--------
 test/language/reserved-words/7.6.1-7-1.js  | 9 +--------
 test/language/reserved-words/7.6.1-7-10.js | 9 +--------
 test/language/reserved-words/7.6.1-7-11.js | 9 +--------
 test/language/reserved-words/7.6.1-7-12.js | 9 +--------
 test/language/reserved-words/7.6.1-7-13.js | 9 +--------
 test/language/reserved-words/7.6.1-7-14.js | 9 +--------
 test/language/reserved-words/7.6.1-7-15.js | 9 +--------
 test/language/reserved-words/7.6.1-7-16.js | 9 +--------
 test/language/reserved-words/7.6.1-7-2.js  | 9 +--------
 test/language/reserved-words/7.6.1-7-3.js  | 9 +--------
 test/language/reserved-words/7.6.1-7-4.js  | 9 +--------
 test/language/reserved-words/7.6.1-7-5.js  | 9 +--------
 test/language/reserved-words/7.6.1-7-6.js  | 9 +--------
 test/language/reserved-words/7.6.1-7-7.js  | 9 +--------
 test/language/reserved-words/7.6.1-7-8.js  | 9 +--------
 test/language/reserved-words/7.6.1-7-9.js  | 9 +--------
 test/language/reserved-words/7.6.1-8-1.js  | 9 +--------
 test/language/reserved-words/7.6.1-8-10.js | 9 +--------
 test/language/reserved-words/7.6.1-8-11.js | 9 +--------
 test/language/reserved-words/7.6.1-8-12.js | 9 +--------
 test/language/reserved-words/7.6.1-8-13.js | 9 +--------
 test/language/reserved-words/7.6.1-8-14.js | 9 +--------
 test/language/reserved-words/7.6.1-8-15.js | 9 +--------
 test/language/reserved-words/7.6.1-8-16.js | 9 +--------
 test/language/reserved-words/7.6.1-8-2.js  | 9 +--------
 test/language/reserved-words/7.6.1-8-3.js  | 9 +--------
 test/language/reserved-words/7.6.1-8-4.js  | 9 +--------
 test/language/reserved-words/7.6.1-8-5.js  | 9 +--------
 test/language/reserved-words/7.6.1-8-6.js  | 9 +--------
 test/language/reserved-words/7.6.1-8-7.js  | 9 +--------
 test/language/reserved-words/7.6.1-8-8.js  | 9 +--------
 test/language/reserved-words/7.6.1-8-9.js  | 9 +--------
 128 files changed, 128 insertions(+), 1024 deletions(-)

diff --git a/test/language/reserved-words/7.6.1-1-1.js b/test/language/reserved-words/7.6.1-1-1.js
index 6ae8a5f888..e266859f05 100644
--- a/test/language/reserved-words/7.6.1-1-1.js
+++ b/test/language/reserved-words/7.6.1-1-1.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-1
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: null, true, false
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             null: 0,
             true: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-10.js b/test/language/reserved-words/7.6.1-1-10.js
index 0f791f1982..dc8c5a3390 100644
--- a/test/language/reserved-words/7.6.1-1-10.js
+++ b/test/language/reserved-words/7.6.1-1-10.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-10
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: in, try, class
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             in: 0, 
             try: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-11.js b/test/language/reserved-words/7.6.1-1-11.js
index 42e086dbf8..b0028f79dd 100644
--- a/test/language/reserved-words/7.6.1-1-11.js
+++ b/test/language/reserved-words/7.6.1-1-11.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-11
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: enum, extends, super
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             enum: 0,
             extends: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-12.js b/test/language/reserved-words/7.6.1-1-12.js
index eeb695b810..68d419c2c2 100644
--- a/test/language/reserved-words/7.6.1-1-12.js
+++ b/test/language/reserved-words/7.6.1-1-12.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-12
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: const, export, import
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             const: 0,
             export: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-13.js b/test/language/reserved-words/7.6.1-1-13.js
index 461a0a61cf..4aa5743784 100644
--- a/test/language/reserved-words/7.6.1-1-13.js
+++ b/test/language/reserved-words/7.6.1-1-13.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-13
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: implements, let, private
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             implements: 0,
             let: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-14.js b/test/language/reserved-words/7.6.1-1-14.js
index b848ffe008..541dd17505 100644
--- a/test/language/reserved-words/7.6.1-1-14.js
+++ b/test/language/reserved-words/7.6.1-1-14.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-14
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: public, yield, interface
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             public: 0,
             yield: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-15.js b/test/language/reserved-words/7.6.1-1-15.js
index 947b9f4c4f..aa3bc86d0f 100644
--- a/test/language/reserved-words/7.6.1-1-15.js
+++ b/test/language/reserved-words/7.6.1-1-15.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-15
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: package, protected, static
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             package: 0,
             protected: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-16.js b/test/language/reserved-words/7.6.1-1-16.js
index 40bf40ec11..cfe3b123e5 100644
--- a/test/language/reserved-words/7.6.1-1-16.js
+++ b/test/language/reserved-words/7.6.1-1-16.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-16
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: undeefined, NaN, Infinity
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             undefined: 0,
             NaN: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-2.js b/test/language/reserved-words/7.6.1-1-2.js
index e8b5d1e380..67fdd5b4cc 100644
--- a/test/language/reserved-words/7.6.1-1-2.js
+++ b/test/language/reserved-words/7.6.1-1-2.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-2
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: break, case, do
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             break: 0,
             case: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-3.js b/test/language/reserved-words/7.6.1-1-3.js
index e67482105e..8c0ccf9fea 100644
--- a/test/language/reserved-words/7.6.1-1-3.js
+++ b/test/language/reserved-words/7.6.1-1-3.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-3
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: instanceof, typeof, else
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             instanceof: 0,
             typeof: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-4.js b/test/language/reserved-words/7.6.1-1-4.js
index c80eb62509..47758acc56 100644
--- a/test/language/reserved-words/7.6.1-1-4.js
+++ b/test/language/reserved-words/7.6.1-1-4.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-4
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: new, var, catch
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             new: 0,
             var: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-5.js b/test/language/reserved-words/7.6.1-1-5.js
index d4d52d4d01..dcb93a8564 100644
--- a/test/language/reserved-words/7.6.1-1-5.js
+++ b/test/language/reserved-words/7.6.1-1-5.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-5
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: finally, return, void
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             finally: 0,
             return: 1,
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-6.js b/test/language/reserved-words/7.6.1-1-6.js
index 1e75aba836..31146148d3 100644
--- a/test/language/reserved-words/7.6.1-1-6.js
+++ b/test/language/reserved-words/7.6.1-1-6.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-6
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: continue, for, switch
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             continue: 0, 
             for: 1, 
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-7.js b/test/language/reserved-words/7.6.1-1-7.js
index 0091c895a8..4fd122a3b4 100644
--- a/test/language/reserved-words/7.6.1-1-7.js
+++ b/test/language/reserved-words/7.6.1-1-7.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-7
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: while, debugger, function
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             while: 0, 
             debugger: 1, 
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-8.js b/test/language/reserved-words/7.6.1-1-8.js
index d1c55dcdc8..2a2adad579 100644
--- a/test/language/reserved-words/7.6.1-1-8.js
+++ b/test/language/reserved-words/7.6.1-1-8.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-8
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: this, with, default
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){
         var tokenCodes  = {       
             this: 0,  
             with: 1, 
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-1-9.js b/test/language/reserved-words/7.6.1-1-9.js
index 56754d62c2..ce170fd135 100644
--- a/test/language/reserved-words/7.6.1-1-9.js
+++ b/test/language/reserved-words/7.6.1-1-9.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-1-9
 description: >
     Allow reserved words as property names at object initialization,
     verified with hasOwnProperty: if, throw, delete
-includes: [runTestCase.js]
 ---*/
 
-function testcase(){      
         var tokenCodes  = { 
             if: 0, 
             throw: 1, 
@@ -23,12 +21,7 @@ function testcase(){
         for(var p in tokenCodes) {
             for(var p1 in arr) {
                 if(arr[p1] === p) {                     
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-}
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-1.js b/test/language/reserved-words/7.6.1-2-1.js
index 9c231301ad..b7da94dad8 100644
--- a/test/language/reserved-words/7.6.1-2-1.js
+++ b/test/language/reserved-words/7.6.1-2-1.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-1
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: null, true, false
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.null = 0;
 	    tokenCodes.true = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-10.js b/test/language/reserved-words/7.6.1-2-10.js
index 0147f0c69b..8fccd0e4be 100644
--- a/test/language/reserved-words/7.6.1-2-10.js
+++ b/test/language/reserved-words/7.6.1-2-10.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-10
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: in, try, class
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes.in = 0;
         tokenCodes.try = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-11.js b/test/language/reserved-words/7.6.1-2-11.js
index 01e6e3a957..89ce1886f0 100644
--- a/test/language/reserved-words/7.6.1-2-11.js
+++ b/test/language/reserved-words/7.6.1-2-11.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-11
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: enum, extends, super
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes.enum = 0;
         tokenCodes.extends = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-12.js b/test/language/reserved-words/7.6.1-2-12.js
index 5c9029c454..51aac3fd46 100644
--- a/test/language/reserved-words/7.6.1-2-12.js
+++ b/test/language/reserved-words/7.6.1-2-12.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-12
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: const, export, import
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.const = 0;
         tokenCodes.export = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-13.js b/test/language/reserved-words/7.6.1-2-13.js
index 928b110f3b..e2778ed0fb 100644
--- a/test/language/reserved-words/7.6.1-2-13.js
+++ b/test/language/reserved-words/7.6.1-2-13.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-13
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: implements, let, private
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.implements = 0;
         tokenCodes.let = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-14.js b/test/language/reserved-words/7.6.1-2-14.js
index f25a1aff98..8146cd25fd 100644
--- a/test/language/reserved-words/7.6.1-2-14.js
+++ b/test/language/reserved-words/7.6.1-2-14.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-14
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: public, yield, interface
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.public = 0;
         tokenCodes.yield = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-15.js b/test/language/reserved-words/7.6.1-2-15.js
index 888c384197..cb5be454b4 100644
--- a/test/language/reserved-words/7.6.1-2-15.js
+++ b/test/language/reserved-words/7.6.1-2-15.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-15
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: package, protected, static
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.package = 0;
         tokenCodes.protected = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-16.js b/test/language/reserved-words/7.6.1-2-16.js
index 140705dee4..4c22b3dc63 100644
--- a/test/language/reserved-words/7.6.1-2-16.js
+++ b/test/language/reserved-words/7.6.1-2-16.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-16
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: undefined, NaN, Infinity
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes.undefined = 0;
         tokenCodes.NaN = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-2.js b/test/language/reserved-words/7.6.1-2-2.js
index a0bbf3797d..d95aeb71f2 100644
--- a/test/language/reserved-words/7.6.1-2-2.js
+++ b/test/language/reserved-words/7.6.1-2-2.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-2
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: break, case, do
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.break = 0;  	
         tokenCodes.case = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-3.js b/test/language/reserved-words/7.6.1-2-3.js
index a6fd8ec281..1d3374dc08 100644
--- a/test/language/reserved-words/7.6.1-2-3.js
+++ b/test/language/reserved-words/7.6.1-2-3.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-3
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: instanceof, typeof, else
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.instanceof = 0;
         tokenCodes.typeof = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-4.js b/test/language/reserved-words/7.6.1-2-4.js
index 4f7be44a34..d4b3ad549a 100644
--- a/test/language/reserved-words/7.6.1-2-4.js
+++ b/test/language/reserved-words/7.6.1-2-4.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-4
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: new, var, catch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes.new = 0;
         tokenCodes.var = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-5.js b/test/language/reserved-words/7.6.1-2-5.js
index aac051bbec..fb1cda05c6 100644
--- a/test/language/reserved-words/7.6.1-2-5.js
+++ b/test/language/reserved-words/7.6.1-2-5.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-5
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: finally, return, void
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes.finally = 0;
         tokenCodes.return = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-6.js b/test/language/reserved-words/7.6.1-2-6.js
index a38487d037..a506cc0eaf 100644
--- a/test/language/reserved-words/7.6.1-2-6.js
+++ b/test/language/reserved-words/7.6.1-2-6.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-6
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: continue, for, switch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.continue = 0;
         tokenCodes.for = 1; 
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-7.js b/test/language/reserved-words/7.6.1-2-7.js
index 5b67031b3f..8d9991db61 100644
--- a/test/language/reserved-words/7.6.1-2-7.js
+++ b/test/language/reserved-words/7.6.1-2-7.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-7
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: while, debugger, function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.while = 0; 
         tokenCodes.debugger = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-8.js b/test/language/reserved-words/7.6.1-2-8.js
index e5ce7f6aa9..dcfb2edbbd 100644
--- a/test/language/reserved-words/7.6.1-2-8.js
+++ b/test/language/reserved-words/7.6.1-2-8.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-8
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: this, with, default
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes.this = 0; 
         tokenCodes.with = 1; 
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-2-9.js b/test/language/reserved-words/7.6.1-2-9.js
index 0fefb4f005..672dd151d5 100644
--- a/test/language/reserved-words/7.6.1-2-9.js
+++ b/test/language/reserved-words/7.6.1-2-9.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-2-9
 description: >
     Allow reserved words as property names by dot operator assignment,
     verified with hasOwnProperty: if, throw, delete
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes.if = 0;
         tokenCodes.throw = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-1.js b/test/language/reserved-words/7.6.1-3-1.js
index 4026dd6570..b4fe62f18b 100644
--- a/test/language/reserved-words/7.6.1-3-1.js
+++ b/test/language/reserved-words/7.6.1-3-1.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-1
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: null, true, false
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['null'] = 0;
 	    tokenCodes['true'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-10.js b/test/language/reserved-words/7.6.1-3-10.js
index 733b67c81b..fc3cfdaf0b 100644
--- a/test/language/reserved-words/7.6.1-3-10.js
+++ b/test/language/reserved-words/7.6.1-3-10.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-10
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: in, try, class
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['in'] = 0;
         tokenCodes['try'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-11.js b/test/language/reserved-words/7.6.1-3-11.js
index 4317466678..11760acac2 100644
--- a/test/language/reserved-words/7.6.1-3-11.js
+++ b/test/language/reserved-words/7.6.1-3-11.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-11
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: enum, extends, super
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['enum'] = 0;
         tokenCodes['extends'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-12.js b/test/language/reserved-words/7.6.1-3-12.js
index b56da9a1fe..6ac38776a2 100644
--- a/test/language/reserved-words/7.6.1-3-12.js
+++ b/test/language/reserved-words/7.6.1-3-12.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-12
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: const, export, import
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['const'] = 0;
         tokenCodes['export'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-13.js b/test/language/reserved-words/7.6.1-3-13.js
index bb686f6b5a..30295413ac 100644
--- a/test/language/reserved-words/7.6.1-3-13.js
+++ b/test/language/reserved-words/7.6.1-3-13.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-13
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: implements, let, private
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['implements'] = 0;
         tokenCodes['let'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-14.js b/test/language/reserved-words/7.6.1-3-14.js
index 41574a31b4..5ecf63f102 100644
--- a/test/language/reserved-words/7.6.1-3-14.js
+++ b/test/language/reserved-words/7.6.1-3-14.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-14
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: public, yield, interface
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['public'] = 0;
         tokenCodes['yield'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-15.js b/test/language/reserved-words/7.6.1-3-15.js
index 3a62f5fb8f..30b8cbe1c2 100644
--- a/test/language/reserved-words/7.6.1-3-15.js
+++ b/test/language/reserved-words/7.6.1-3-15.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-15
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: package, protected, static
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['package'] = 0;
         tokenCodes['protected'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-16.js b/test/language/reserved-words/7.6.1-3-16.js
index 61ebc4a748..cade684d40 100644
--- a/test/language/reserved-words/7.6.1-3-16.js
+++ b/test/language/reserved-words/7.6.1-3-16.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-16
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: undefined, NaN, Infinity
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['undefined'] = 0;
         tokenCodes['NaN'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-2.js b/test/language/reserved-words/7.6.1-3-2.js
index f3c18b1def..966beaed8e 100644
--- a/test/language/reserved-words/7.6.1-3-2.js
+++ b/test/language/reserved-words/7.6.1-3-2.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-2
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: break, case, do
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['break'] = 0;
         tokenCodes['case'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-3.js b/test/language/reserved-words/7.6.1-3-3.js
index 47688082fa..65969a5512 100644
--- a/test/language/reserved-words/7.6.1-3-3.js
+++ b/test/language/reserved-words/7.6.1-3-3.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-3
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: instanceof, typeof, else
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['instanceof'] = 0;
         tokenCodes['typeof'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-4.js b/test/language/reserved-words/7.6.1-3-4.js
index bcb8d36df3..709f50c81f 100644
--- a/test/language/reserved-words/7.6.1-3-4.js
+++ b/test/language/reserved-words/7.6.1-3-4.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-4
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: new, var, catch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['new'] = 0;
         tokenCodes['var'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-5.js b/test/language/reserved-words/7.6.1-3-5.js
index 9e8c8edcd8..a19b8e05ca 100644
--- a/test/language/reserved-words/7.6.1-3-5.js
+++ b/test/language/reserved-words/7.6.1-3-5.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-5
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: finally, return, void
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['finally'] = 0;
         tokenCodes['return'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-6.js b/test/language/reserved-words/7.6.1-3-6.js
index 678fada81b..c37dd1089c 100644
--- a/test/language/reserved-words/7.6.1-3-6.js
+++ b/test/language/reserved-words/7.6.1-3-6.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-6
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: continue, for, switch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['continue'] = 0;
         tokenCodes['for'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-7.js b/test/language/reserved-words/7.6.1-3-7.js
index 5f0fa3db28..0d3a7f639b 100644
--- a/test/language/reserved-words/7.6.1-3-7.js
+++ b/test/language/reserved-words/7.6.1-3-7.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-7
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: while, debugger, function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['while'] = 0;
         tokenCodes['debugger'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-8.js b/test/language/reserved-words/7.6.1-3-8.js
index 983686b6b4..e0a49e2f54 100644
--- a/test/language/reserved-words/7.6.1-3-8.js
+++ b/test/language/reserved-words/7.6.1-3-8.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-8
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: this, with, default
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['this'] = 0;
         tokenCodes['with'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-3-9.js b/test/language/reserved-words/7.6.1-3-9.js
index fef54c96b8..5dea91a629 100644
--- a/test/language/reserved-words/7.6.1-3-9.js
+++ b/test/language/reserved-words/7.6.1-3-9.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-3-9
 description: >
     Allow reserved words as property names by index
     assignment,verified with hasOwnProperty: if, throw, delete
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes['if'] = 0;
         tokenCodes['throw'] = 1;
@@ -22,12 +20,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-1.js b/test/language/reserved-words/7.6.1-4-1.js
index 8c9e1d4bde..4a7a6ae921 100644
--- a/test/language/reserved-words/7.6.1-4-1.js
+++ b/test/language/reserved-words/7.6.1-4-1.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-1
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: null, true, false
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set null(value) {
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-10.js b/test/language/reserved-words/7.6.1-4-10.js
index 36dc23c97a..29a0c5fd46 100644
--- a/test/language/reserved-words/7.6.1-4-10.js
+++ b/test/language/reserved-words/7.6.1-4-10.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-10
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: in, try, class
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set in(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-11.js b/test/language/reserved-words/7.6.1-4-11.js
index 9988776dff..7e875e1b68 100644
--- a/test/language/reserved-words/7.6.1-4-11.js
+++ b/test/language/reserved-words/7.6.1-4-11.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-11
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: enum, extends, super
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set enum(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-12.js b/test/language/reserved-words/7.6.1-4-12.js
index 050ddca7f6..051b2a8a7e 100644
--- a/test/language/reserved-words/7.6.1-4-12.js
+++ b/test/language/reserved-words/7.6.1-4-12.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-12
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: const, export, import
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set const(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-13.js b/test/language/reserved-words/7.6.1-4-13.js
index 4c2f6a154e..69a79f9ae3 100644
--- a/test/language/reserved-words/7.6.1-4-13.js
+++ b/test/language/reserved-words/7.6.1-4-13.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-13
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: implements, let, private
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set implements(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-14.js b/test/language/reserved-words/7.6.1-4-14.js
index 1151447953..152021a1bc 100644
--- a/test/language/reserved-words/7.6.1-4-14.js
+++ b/test/language/reserved-words/7.6.1-4-14.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-14
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: public, yield, interface
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set public(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-15.js b/test/language/reserved-words/7.6.1-4-15.js
index 06eebbd7da..8e25906549 100644
--- a/test/language/reserved-words/7.6.1-4-15.js
+++ b/test/language/reserved-words/7.6.1-4-15.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-15
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: package, protected, static
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set package(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-16.js b/test/language/reserved-words/7.6.1-4-16.js
index b5692b1cdf..f7c3800b59 100644
--- a/test/language/reserved-words/7.6.1-4-16.js
+++ b/test/language/reserved-words/7.6.1-4-16.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-16
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: undefined, NaN, Infinity
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set undefined(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-2.js b/test/language/reserved-words/7.6.1-4-2.js
index b217448255..73ab9e8f89 100644
--- a/test/language/reserved-words/7.6.1-4-2.js
+++ b/test/language/reserved-words/7.6.1-4-2.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-2
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: break, case, do
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set break(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-3.js b/test/language/reserved-words/7.6.1-4-3.js
index 88c06621f7..99684a6c6a 100644
--- a/test/language/reserved-words/7.6.1-4-3.js
+++ b/test/language/reserved-words/7.6.1-4-3.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-3
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: instanceof, typeof, else
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set instanceof(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-4.js b/test/language/reserved-words/7.6.1-4-4.js
index c67398f708..a7c3144080 100644
--- a/test/language/reserved-words/7.6.1-4-4.js
+++ b/test/language/reserved-words/7.6.1-4-4.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-4
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: new, var, catch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set new(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-5.js b/test/language/reserved-words/7.6.1-4-5.js
index e3fa549c98..df01004fdd 100644
--- a/test/language/reserved-words/7.6.1-4-5.js
+++ b/test/language/reserved-words/7.6.1-4-5.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-5
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: finally, return, void
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set finally(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-6.js b/test/language/reserved-words/7.6.1-4-6.js
index 293f6968fc..fbd5e27765 100644
--- a/test/language/reserved-words/7.6.1-4-6.js
+++ b/test/language/reserved-words/7.6.1-4-6.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-6
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: continue, for, switch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set continue(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-7.js b/test/language/reserved-words/7.6.1-4-7.js
index a511aaa636..7f5a957f9e 100644
--- a/test/language/reserved-words/7.6.1-4-7.js
+++ b/test/language/reserved-words/7.6.1-4-7.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-7
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: while, debugger, function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set while(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-8.js b/test/language/reserved-words/7.6.1-4-8.js
index 683eb90038..29e2fdc25e 100644
--- a/test/language/reserved-words/7.6.1-4-8.js
+++ b/test/language/reserved-words/7.6.1-4-8.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-8
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: this, with, default
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set this(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-4-9.js b/test/language/reserved-words/7.6.1-4-9.js
index 92ed4dbfa6..e71237849a 100644
--- a/test/language/reserved-words/7.6.1-4-9.js
+++ b/test/language/reserved-words/7.6.1-4-9.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-4-9
 description: >
     Allow reserved words as property names by set function within an
     object, verified with hasOwnProperty: if, throw, delete
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set if(value){
@@ -39,12 +37,7 @@ function testcase() {
         for(var p in tokenCodes) {       
             for(var p1 in arr) {                
                 if(arr[p1] === p) {
-                    if(!tokenCodes.hasOwnProperty(arr[p1])) {
-                        return false;
-                    };
+                    assert(tokenCodes.hasOwnProperty(arr[p1]), 'tokenCodes.hasOwnProperty(arr[p1]) !== true');
                 }
             }
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-1.js b/test/language/reserved-words/7.6.1-5-1.js
index bbbc32b806..e0a01a0764 100644
--- a/test/language/reserved-words/7.6.1-5-1.js
+++ b/test/language/reserved-words/7.6.1-5-1.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-1
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: null, true, false
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = { 
             null: 0,
             true: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'false'
         ];  
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-10.js b/test/language/reserved-words/7.6.1-5-10.js
index 32ca3f8425..e285af4064 100644
--- a/test/language/reserved-words/7.6.1-5-10.js
+++ b/test/language/reserved-words/7.6.1-5-10.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-10
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: in, try, class
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = { 
             in: 0, 
             try: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'class'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-11.js b/test/language/reserved-words/7.6.1-5-11.js
index b6590d692c..1b28cff115 100644
--- a/test/language/reserved-words/7.6.1-5-11.js
+++ b/test/language/reserved-words/7.6.1-5-11.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-11
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: enum, extends, super
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {
             enum: 0,
             extends: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'super'
         ];  
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-12.js b/test/language/reserved-words/7.6.1-5-12.js
index 9a1fbea83b..eb7dfd0bfb 100644
--- a/test/language/reserved-words/7.6.1-5-12.js
+++ b/test/language/reserved-words/7.6.1-5-12.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-12
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: const, export, import
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {
             const : 0,
             export: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'import'
         ]; 
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-13.js b/test/language/reserved-words/7.6.1-5-13.js
index baed97720b..2e6d20bd84 100644
--- a/test/language/reserved-words/7.6.1-5-13.js
+++ b/test/language/reserved-words/7.6.1-5-13.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-13
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: implements, let, private
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {
             implements: 0,
             let: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'private'
         ];   
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-14.js b/test/language/reserved-words/7.6.1-5-14.js
index eecbfe596c..a35df0d2f4 100644
--- a/test/language/reserved-words/7.6.1-5-14.js
+++ b/test/language/reserved-words/7.6.1-5-14.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-14
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: public, yield, interface
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {
             public: 0,
             yield: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'interface'
         ]; 
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-15.js b/test/language/reserved-words/7.6.1-5-15.js
index 093182a9ef..8cf154fb1b 100644
--- a/test/language/reserved-words/7.6.1-5-15.js
+++ b/test/language/reserved-words/7.6.1-5-15.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-15
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: package, protected, static
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {
             package: 0,
             protected: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'static'
         ];  
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-16.js b/test/language/reserved-words/7.6.1-5-16.js
index 9197734fff..c4bb2b1e19 100644
--- a/test/language/reserved-words/7.6.1-5-16.js
+++ b/test/language/reserved-words/7.6.1-5-16.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-16
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: undefined, NaN, Infinity
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {
             undefined: 0,
             NaN: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'Infinity'
         ]; 
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-2.js b/test/language/reserved-words/7.6.1-5-2.js
index ae5f7a9ff2..6554bfd373 100644
--- a/test/language/reserved-words/7.6.1-5-2.js
+++ b/test/language/reserved-words/7.6.1-5-2.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-2
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: break, case, do
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = { 
             break: 0,
             case: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'do'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-3.js b/test/language/reserved-words/7.6.1-5-3.js
index 957e749d67..495c10a5c0 100644
--- a/test/language/reserved-words/7.6.1-5-3.js
+++ b/test/language/reserved-words/7.6.1-5-3.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-3
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: instanceof, typeof, else
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = { 
             instanceof: 0,
             typeof: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'else'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-4.js b/test/language/reserved-words/7.6.1-5-4.js
index d09232bd04..69c0d1971e 100644
--- a/test/language/reserved-words/7.6.1-5-4.js
+++ b/test/language/reserved-words/7.6.1-5-4.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-4
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: new, var, catch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = { 
             new: 0,
             var: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'catch'
         ]; 
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-5.js b/test/language/reserved-words/7.6.1-5-5.js
index 98caf9eb41..8a0bb2e67b 100644
--- a/test/language/reserved-words/7.6.1-5-5.js
+++ b/test/language/reserved-words/7.6.1-5-5.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-5
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: finally, return, void
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = { 
             finally: 0,
             return: 1,
@@ -21,10 +19,5 @@ function testcase() {
             'void'
         ];  
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-6.js b/test/language/reserved-words/7.6.1-5-6.js
index fcbb33b2f2..af89ce7dc5 100644
--- a/test/language/reserved-words/7.6.1-5-6.js
+++ b/test/language/reserved-words/7.6.1-5-6.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-6
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: continue, for, switch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = { 
             continue: 0, 
             for: 1, 
@@ -21,10 +19,5 @@ function testcase() {
             'switch'
         ];  
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-7.js b/test/language/reserved-words/7.6.1-5-7.js
index d2b8e05b30..f941c1fac0 100644
--- a/test/language/reserved-words/7.6.1-5-7.js
+++ b/test/language/reserved-words/7.6.1-5-7.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-7
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: while, debugger, function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = { 
             while: 0, 
             debugger: 1, 
@@ -21,10 +19,5 @@ function testcase() {
             'function'
         ];    
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-8.js b/test/language/reserved-words/7.6.1-5-8.js
index fae8df8886..8ba8c8514a 100644
--- a/test/language/reserved-words/7.6.1-5-8.js
+++ b/test/language/reserved-words/7.6.1-5-8.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-8
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: this, with, default
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {       
             this: 0,  
             with: 1, 
@@ -21,10 +19,5 @@ function testcase() {
             'default'
         ]; 
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-5-9.js b/test/language/reserved-words/7.6.1-5-9.js
index acbe8beb5f..addcefd695 100644
--- a/test/language/reserved-words/7.6.1-5-9.js
+++ b/test/language/reserved-words/7.6.1-5-9.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-5-9
 description: >
     Allow reserved words as property names at object initialization,
     accessed via indexing: if, throw, delete
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = { 
             if: 0, 
             throw: 1, 
@@ -21,10 +19,5 @@ function testcase() {
             'delete'
         ];   
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-1.js b/test/language/reserved-words/7.6.1-6-1.js
index 016faaed3d..561d4bbb0c 100644
--- a/test/language/reserved-words/7.6.1-6-1.js
+++ b/test/language/reserved-words/7.6.1-6-1.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-1
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: null, true, false
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.null = 0;
 	    tokenCodes.true = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'false'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-10.js b/test/language/reserved-words/7.6.1-6-10.js
index 3a4d4b210a..df67a9d9f9 100644
--- a/test/language/reserved-words/7.6.1-6-10.js
+++ b/test/language/reserved-words/7.6.1-6-10.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-10
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: in, try, class
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.in = 0;
         tokenCodes.try = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'class'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-11.js b/test/language/reserved-words/7.6.1-6-11.js
index 6e65fbb973..c4bbad191d 100644
--- a/test/language/reserved-words/7.6.1-6-11.js
+++ b/test/language/reserved-words/7.6.1-6-11.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-11
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: enum, extends, super
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.enum = 0;
         tokenCodes.extends = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'super'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-12.js b/test/language/reserved-words/7.6.1-6-12.js
index 215e04a151..c5869fc4da 100644
--- a/test/language/reserved-words/7.6.1-6-12.js
+++ b/test/language/reserved-words/7.6.1-6-12.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-12
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: const, export, import
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.const = 0;
         tokenCodes.export = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'import'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-13.js b/test/language/reserved-words/7.6.1-6-13.js
index 86ff179c36..3bab164674 100644
--- a/test/language/reserved-words/7.6.1-6-13.js
+++ b/test/language/reserved-words/7.6.1-6-13.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-13
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: implements, let, private
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.implements = 0;
         tokenCodes.let = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'private'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-14.js b/test/language/reserved-words/7.6.1-6-14.js
index 914837317c..25ad3c13de 100644
--- a/test/language/reserved-words/7.6.1-6-14.js
+++ b/test/language/reserved-words/7.6.1-6-14.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-14
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: public, yield, interface
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.public = 0;
         tokenCodes.yield = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'interface'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-15.js b/test/language/reserved-words/7.6.1-6-15.js
index b7e7a51e26..87cc5259f5 100644
--- a/test/language/reserved-words/7.6.1-6-15.js
+++ b/test/language/reserved-words/7.6.1-6-15.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-15
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: package, protected, static
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.package = 0;
         tokenCodes.protected = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'static' 
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-16.js b/test/language/reserved-words/7.6.1-6-16.js
index 90a01d345b..a8480ac315 100644
--- a/test/language/reserved-words/7.6.1-6-16.js
+++ b/test/language/reserved-words/7.6.1-6-16.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-16
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: undefined, NaN, Infinity
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.undefined = 0;
         tokenCodes.NaN = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'Infinity'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-2.js b/test/language/reserved-words/7.6.1-6-2.js
index e485d8010a..ce2858baba 100644
--- a/test/language/reserved-words/7.6.1-6-2.js
+++ b/test/language/reserved-words/7.6.1-6-2.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-2
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: break, case, do
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes.break = 0;  	
         tokenCodes.case = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'do'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-3.js b/test/language/reserved-words/7.6.1-6-3.js
index b51d89e3e2..76da8dc035 100644
--- a/test/language/reserved-words/7.6.1-6-3.js
+++ b/test/language/reserved-words/7.6.1-6-3.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-3
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: instanceof, typeof, else
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.instanceof = 0;
         tokenCodes.typeof = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'else'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-4.js b/test/language/reserved-words/7.6.1-6-4.js
index 4cfaf710e6..1006c2c5bf 100644
--- a/test/language/reserved-words/7.6.1-6-4.js
+++ b/test/language/reserved-words/7.6.1-6-4.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-4
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: new, var, catch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.new = 0;
         tokenCodes.var = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'catch'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-5.js b/test/language/reserved-words/7.6.1-6-5.js
index edbf6eb121..c69dee5132 100644
--- a/test/language/reserved-words/7.6.1-6-5.js
+++ b/test/language/reserved-words/7.6.1-6-5.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-5
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: finally, return, void
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.finally = 0;
         tokenCodes.return = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'void'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-6.js b/test/language/reserved-words/7.6.1-6-6.js
index ab1814965c..00ab0eacb7 100644
--- a/test/language/reserved-words/7.6.1-6-6.js
+++ b/test/language/reserved-words/7.6.1-6-6.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-6
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: continue, for, switch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.continue = 0;
         tokenCodes.for = 1; 
@@ -20,10 +18,5 @@ function testcase() {
             'switch'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-7.js b/test/language/reserved-words/7.6.1-6-7.js
index e686bda9e5..8ae455dc01 100644
--- a/test/language/reserved-words/7.6.1-6-7.js
+++ b/test/language/reserved-words/7.6.1-6-7.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-7
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: while, debugger, function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.while = 0; 
         tokenCodes.debugger = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'function'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-8.js b/test/language/reserved-words/7.6.1-6-8.js
index d97927ffc2..3fe91178ac 100644
--- a/test/language/reserved-words/7.6.1-6-8.js
+++ b/test/language/reserved-words/7.6.1-6-8.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-8
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: this, with, default
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.this = 0; 
         tokenCodes.with = 1; 
@@ -20,10 +18,5 @@ function testcase() {
             'default'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-6-9.js b/test/language/reserved-words/7.6.1-6-9.js
index f5c1eb39c7..4deb78e795 100644
--- a/test/language/reserved-words/7.6.1-6-9.js
+++ b/test/language/reserved-words/7.6.1-6-9.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-6-9
 description: >
     Allow reserved words as property names by dot operator assignment,
     accessed via indexing: if, throw, delete
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes  = {};
         tokenCodes.if = 0;
         tokenCodes.throw = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'delete'
          ];
          for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-1.js b/test/language/reserved-words/7.6.1-7-1.js
index 54a83835bc..9f133d685a 100644
--- a/test/language/reserved-words/7.6.1-7-1.js
+++ b/test/language/reserved-words/7.6.1-7-1.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-1
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: null, true, false
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['null'] = 0;
         tokenCodes['true'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'false'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-10.js b/test/language/reserved-words/7.6.1-7-10.js
index ad25678e7f..73a5f5388e 100644
--- a/test/language/reserved-words/7.6.1-7-10.js
+++ b/test/language/reserved-words/7.6.1-7-10.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-10
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: in, try, class
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['in'] = 0;
         tokenCodes['try'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'class'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-11.js b/test/language/reserved-words/7.6.1-7-11.js
index cd045acf2f..71a9921cad 100644
--- a/test/language/reserved-words/7.6.1-7-11.js
+++ b/test/language/reserved-words/7.6.1-7-11.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-11
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: enum, extends, super
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['enum'] = 0;
         tokenCodes['extends'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'super'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-12.js b/test/language/reserved-words/7.6.1-7-12.js
index 948ac261a6..a170a97104 100644
--- a/test/language/reserved-words/7.6.1-7-12.js
+++ b/test/language/reserved-words/7.6.1-7-12.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-12
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: const, export, import
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['const'] = 0;
         tokenCodes['export'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'import'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-13.js b/test/language/reserved-words/7.6.1-7-13.js
index df1da4d1ab..867a4b1ef1 100644
--- a/test/language/reserved-words/7.6.1-7-13.js
+++ b/test/language/reserved-words/7.6.1-7-13.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-13
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: implements, let, private
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['implements'] = 0;
         tokenCodes['let'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'private'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-14.js b/test/language/reserved-words/7.6.1-7-14.js
index 7078ba72e7..dbde3903df 100644
--- a/test/language/reserved-words/7.6.1-7-14.js
+++ b/test/language/reserved-words/7.6.1-7-14.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-14
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: public, yield, interface
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['public'] = 0;
         tokenCodes['yield'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'interface'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-15.js b/test/language/reserved-words/7.6.1-7-15.js
index 804d881db7..c86bf3c2b6 100644
--- a/test/language/reserved-words/7.6.1-7-15.js
+++ b/test/language/reserved-words/7.6.1-7-15.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-15
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: package, protected, static
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['package'] = 0;
         tokenCodes['protected'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'static' 
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-16.js b/test/language/reserved-words/7.6.1-7-16.js
index 560516938e..610ff78b7c 100644
--- a/test/language/reserved-words/7.6.1-7-16.js
+++ b/test/language/reserved-words/7.6.1-7-16.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-16
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: undefined, NaN, Infinity
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['undefined'] = 0;
         tokenCodes['NaN'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'Infinity'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-2.js b/test/language/reserved-words/7.6.1-7-2.js
index 77f0d3bc55..5fdb398806 100644
--- a/test/language/reserved-words/7.6.1-7-2.js
+++ b/test/language/reserved-words/7.6.1-7-2.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-2
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: break, case, do
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['break'] = 0;
         tokenCodes['case'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'do'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-3.js b/test/language/reserved-words/7.6.1-7-3.js
index 4c2ae67623..6afbe6030f 100644
--- a/test/language/reserved-words/7.6.1-7-3.js
+++ b/test/language/reserved-words/7.6.1-7-3.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-3
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: instanceof, typeof, else
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['instanceof'] = 0;
         tokenCodes['typeof'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'else'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-4.js b/test/language/reserved-words/7.6.1-7-4.js
index de11f76062..55211a2163 100644
--- a/test/language/reserved-words/7.6.1-7-4.js
+++ b/test/language/reserved-words/7.6.1-7-4.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-4
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: new, var, catch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['new'] = 0;
         tokenCodes['var'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'catch'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-5.js b/test/language/reserved-words/7.6.1-7-5.js
index 7a346a0abd..abc6344c92 100644
--- a/test/language/reserved-words/7.6.1-7-5.js
+++ b/test/language/reserved-words/7.6.1-7-5.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-5
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: finally, return, void
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['finally'] = 0;
         tokenCodes['return'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'void'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-6.js b/test/language/reserved-words/7.6.1-7-6.js
index 22ade04c59..7a63adc9e9 100644
--- a/test/language/reserved-words/7.6.1-7-6.js
+++ b/test/language/reserved-words/7.6.1-7-6.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-6
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: continue, for, switch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['continue'] = 0;
         tokenCodes['for'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'switch'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-7.js b/test/language/reserved-words/7.6.1-7-7.js
index a420f93304..d3b80b67ab 100644
--- a/test/language/reserved-words/7.6.1-7-7.js
+++ b/test/language/reserved-words/7.6.1-7-7.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-7
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: while, debugger, function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['while'] = 0;
         tokenCodes['debugger'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'function'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-8.js b/test/language/reserved-words/7.6.1-7-8.js
index 159551f7e8..a5609cac27 100644
--- a/test/language/reserved-words/7.6.1-7-8.js
+++ b/test/language/reserved-words/7.6.1-7-8.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-8
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: this, with, default
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['this'] = 0;
         tokenCodes['with'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'default'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-7-9.js b/test/language/reserved-words/7.6.1-7-9.js
index 39545d6f09..ddeb26bd7b 100644
--- a/test/language/reserved-words/7.6.1-7-9.js
+++ b/test/language/reserved-words/7.6.1-7-9.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-7-9
 description: >
     Allow reserved words as property names by index assignment,
     accessed via indexing: if, throw, delete
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var tokenCodes = {};
         tokenCodes['if'] = 0;
         tokenCodes['throw'] = 1;
@@ -20,10 +18,5 @@ function testcase() {
             'delete'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-1.js b/test/language/reserved-words/7.6.1-8-1.js
index 5ac3dfad4f..9b59ab56a1 100644
--- a/test/language/reserved-words/7.6.1-8-1.js
+++ b/test/language/reserved-words/7.6.1-8-1.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-1
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: null, true, false
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set null(value) {
@@ -37,10 +35,5 @@ function testcase() {
             'false'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-10.js b/test/language/reserved-words/7.6.1-8-10.js
index 7ec2e2ff77..f45212e4af 100644
--- a/test/language/reserved-words/7.6.1-8-10.js
+++ b/test/language/reserved-words/7.6.1-8-10.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-10
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: in, try, class
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set in(value){
@@ -37,10 +35,5 @@ function testcase() {
             'class'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-11.js b/test/language/reserved-words/7.6.1-8-11.js
index ff46b4587f..e40d5e3c74 100644
--- a/test/language/reserved-words/7.6.1-8-11.js
+++ b/test/language/reserved-words/7.6.1-8-11.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-11
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: enum, extends, super
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set enum(value){
@@ -37,10 +35,5 @@ function testcase() {
             'super'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-12.js b/test/language/reserved-words/7.6.1-8-12.js
index 9e6168fe7f..408f9d7b10 100644
--- a/test/language/reserved-words/7.6.1-8-12.js
+++ b/test/language/reserved-words/7.6.1-8-12.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-12
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: const, export, import
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set const(value){
@@ -37,10 +35,5 @@ function testcase() {
             'import'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-13.js b/test/language/reserved-words/7.6.1-8-13.js
index 48f16e9d94..9f96611bd2 100644
--- a/test/language/reserved-words/7.6.1-8-13.js
+++ b/test/language/reserved-words/7.6.1-8-13.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-13
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: implements, let, private
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set implements(value){
@@ -37,10 +35,5 @@ function testcase() {
             'private'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-14.js b/test/language/reserved-words/7.6.1-8-14.js
index cc484c1e04..303b43fe17 100644
--- a/test/language/reserved-words/7.6.1-8-14.js
+++ b/test/language/reserved-words/7.6.1-8-14.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-14
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: public, yield, interface
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set public(value){
@@ -37,10 +35,5 @@ function testcase() {
             'interface'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-15.js b/test/language/reserved-words/7.6.1-8-15.js
index 83398e881a..96fad33bda 100644
--- a/test/language/reserved-words/7.6.1-8-15.js
+++ b/test/language/reserved-words/7.6.1-8-15.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-15
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: package, protected, static
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set package(value){
@@ -37,10 +35,5 @@ function testcase() {
             'static'  
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-16.js b/test/language/reserved-words/7.6.1-8-16.js
index e555d1ec4e..d83d5ad7ad 100644
--- a/test/language/reserved-words/7.6.1-8-16.js
+++ b/test/language/reserved-words/7.6.1-8-16.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-16
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: undefined, NaN, Infinity
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set undefined(value){
@@ -37,10 +35,5 @@ function testcase() {
             'Infinity'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-2.js b/test/language/reserved-words/7.6.1-8-2.js
index 63e573523f..fcb2bb984a 100644
--- a/test/language/reserved-words/7.6.1-8-2.js
+++ b/test/language/reserved-words/7.6.1-8-2.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-2
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: break, case, do
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set break(value){
@@ -37,10 +35,5 @@ function testcase() {
             'do'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-3.js b/test/language/reserved-words/7.6.1-8-3.js
index 260fe28766..be9de6d11e 100644
--- a/test/language/reserved-words/7.6.1-8-3.js
+++ b/test/language/reserved-words/7.6.1-8-3.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-3
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: instanceof, typeof, else
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set instanceof(value){
@@ -37,10 +35,5 @@ function testcase() {
             'else'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-4.js b/test/language/reserved-words/7.6.1-8-4.js
index fac3ade5ef..1dafc2bd4f 100644
--- a/test/language/reserved-words/7.6.1-8-4.js
+++ b/test/language/reserved-words/7.6.1-8-4.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-4
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: new, var, catch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set new(value){
@@ -37,10 +35,5 @@ function testcase() {
             'catch'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-5.js b/test/language/reserved-words/7.6.1-8-5.js
index 3587cf64bd..8c559e944d 100644
--- a/test/language/reserved-words/7.6.1-8-5.js
+++ b/test/language/reserved-words/7.6.1-8-5.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-5
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: finally, return, void
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set finally(value){
@@ -37,10 +35,5 @@ function testcase() {
             'void'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-6.js b/test/language/reserved-words/7.6.1-8-6.js
index 20fd05f5f5..8dbd116360 100644
--- a/test/language/reserved-words/7.6.1-8-6.js
+++ b/test/language/reserved-words/7.6.1-8-6.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-6
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: continue, for, switch
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set continue(value){
@@ -37,10 +35,5 @@ function testcase() {
             'switch'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-7.js b/test/language/reserved-words/7.6.1-8-7.js
index 24a395c640..a352ea5fe4 100644
--- a/test/language/reserved-words/7.6.1-8-7.js
+++ b/test/language/reserved-words/7.6.1-8-7.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-7
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: while, debugger, function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set while(value){
@@ -37,10 +35,5 @@ function testcase() {
             'function'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-8.js b/test/language/reserved-words/7.6.1-8-8.js
index a5c59e9cb0..ec0146497d 100644
--- a/test/language/reserved-words/7.6.1-8-8.js
+++ b/test/language/reserved-words/7.6.1-8-8.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-8
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: this, with, default
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set this(value){
@@ -37,10 +35,5 @@ function testcase() {
             'default'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
diff --git a/test/language/reserved-words/7.6.1-8-9.js b/test/language/reserved-words/7.6.1-8-9.js
index a635d13c41..921f0503ed 100644
--- a/test/language/reserved-words/7.6.1-8-9.js
+++ b/test/language/reserved-words/7.6.1-8-9.js
@@ -6,10 +6,8 @@ es5id: 7.6.1-8-9
 description: >
     Allow reserved words as property names by set function within an
     object, accessed via indexing: if, throw, delete
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var test0 = 0, test1 = 1, test2 = 2;
         var tokenCodes  = {
             set if(value){
@@ -37,10 +35,5 @@ function testcase() {
             'delete'
         ];
         for (var i = 0; i < arr.length; i++) {
-            if (tokenCodes[arr[i]] !== i) {
-                return false;
-            };
+            assert.sameValue(tokenCodes[arr[i]], i, 'tokenCodes[arr[i]]');
         }
-        return true;
-    }
-runTestCase(testcase);
-- 
GitLab