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 6ae8a5f888c05e3c6d2a405a00b6b3a737bf4c73..e266859f05b4869c2ef581ca7d597c16ecb240f8 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 0f791f198234d466fcf0fb92277061f60ac03360..dc8c5a33900a6b70858f05e793bdec2adf9ce7ad 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 42e086dbf8e4ee734dc1bd7c727db6b479fa7899..b0028f79ddf8120285a6ed620bc0af97c74ad43c 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 eeb695b8100db5114c3523663dd002594a166a8f..68d419c2c20946d18d0674bc3feb00efff037512 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 461a0a61cfa9b31330f2d2c316fd362867f8ce47..4aa5743784da29339eeda7b68a2998124f3970af 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 b848ffe0085469e6ceed33f10170de3e0ca63c19..541dd17505a0a2c5e750aa9aeaa399f2b7c921ce 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 947b9f4c4ff4d42bb4686d798380dba0520bbeb8..aa3bc86d0f4526c1d75951acf82c2312df28d7a3 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 40bf40ec1161cfc87e71021f523fd53371aecae0..cfe3b123e531b4f31182d5fbc6b20bbebc9a03ed 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 e8b5d1e380daa02e886c1fea4aa6d73bdb3c7de4..67fdd5b4cc163f6fb29162a28a6a61489725a2e3 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 e67482105ece3b33e520f148ce6cc881790f3f10..8c0ccf9fea39836c3192e69e1ddccd230734e62f 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 c80eb62509f6711548a489c3cd730232f89b3062..47758acc56adfec64f9fe6bf6d1f367d41554a25 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 d4d52d4d0150ddc287ea081919cb9adbcb6fd373..dcb93a8564f1fe877e0b132f180d2e867f57e0ed 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 1e75aba836e88f21ec2aad10c88a4b1e1e45e730..31146148d3812498cddc84907c0c3bda46ffb0a0 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 0091c895a8efabe97d1058bfaf5e00d518373512..4fd122a3b4e4c3a57ef33acb915fabcfba2e781d 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 d1c55dcdc8e09e12ffaef40d3f46250f73fe76f8..2a2adad5791aa301b8287d795b28473fa174c491 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 56754d62c2e4ca65613046fc0a11d9bdef71e69e..ce170fd135fc76bd8a2828fc3ab046d16be625be 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 9c231301ade3cb465ddd6d309cc8dd767f9aca62..b7da94dad8fc1c99bb129ab61e8ed32efff39507 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 0147f0c69bd253b2447cddceea9b896aa5113ed8..8fccd0e4be76f37860eb5094e9780a6fae8643ed 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 01e6e3a957379fc434feb6151651a05838311a70..89ce1886f05d403fb24921ed239598c036b7f472 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 5c9029c4541e3919a578cc1cf64ae19c99c3c799..51aac3fd46f89cf8754d09cd69cdea5b0d3d977a 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 928b110f3b4862501e92dcf9d2dccd54715deb17..e2778ed0fbac8a94414e7cab65c05dd869fe91b2 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 f25a1aff98367a543b91bbfa360e796d1e063061..8146cd25fd87cff922eb66ffce9f6ebc55fd0f65 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 888c38419742a40f5218738d54d4de97a2ece598..cb5be454b4779a1b7535d459b4f088184d25252b 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 140705dee47f1509003b88031be06c12a49686a1..4c22b3dc6344a80d7dda296a47a6c270d0ef9539 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 a0bbf3797decc2d9c294fc9ec82e484feb10e732..d95aeb71f299ca871237bb3ffebbc626308977dd 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 a6fd8ec2819408ededc81fea2afa5dfea333415d..1d3374dc08b170a5de682396aca064f16d72561c 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 4f7be44a344aae9ca04d80a1b8d690b7661349ac..d4b3ad549a929f59fa3be192b987b902f158fb3c 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 aac051bbecc4e14354c27ba12ab624d29ec6df84..fb1cda05c64fd6113ae36bbbe4f83144abb9135d 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 a38487d03788e28f33b8523e1fe8aedbe3e0b253..a506cc0eaf20c7c9ae8e07d38b4b07088294e02e 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 5b67031b3f2162dffe05fbca2907af08a2356fb9..8d9991db61827c2c3d5858643d43474308e8f299 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 e5ce7f6aa9926491d2b4078a8394a364bb7be706..dcfb2edbbd456b6226a883a5fd321f81d66cf2d8 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 0fefb4f00516eeab9c0ad4f71fa816dcc9e20ad3..672dd151d59a4a89bc8b94bec3e38bd1d01d93d1 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 4026dd657025493906d1bba46c210feb930d8a14..b4fe62f18bc3b58a5772384b3f3120ea5fb1acac 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 733b67c81b6c522788813b9d55dd7298a6b7fa83..fc3cfdaf0bbfd7530c0a8b5dbd5f24370bd42ca1 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 4317466678ff883650fd071d47c20cc32cd7f857..11760acac2b5026588cc949294b32ffdc56a2290 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 b56da9a1fefd3d55f213e0af2d5c5ab55399a605..6ac38776a2e8d926a2f009f5a84d42ae39011bfe 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 bb686f6b5aa8a9ff28fa477dc56546ae5ae757fa..30295413ac63746b42d5229eba81cb5dcb1172ca 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 41574a31b4ff3bf61a5507da083798a9dee19d55..5ecf63f102aa42e437c37955c2edd08b0c6524f1 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 3a62f5fb8f47eddba8439726a895a244830ce982..30b8cbe1c2a0f5422170fae4b121392e4ebe3f04 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 61ebc4a748732a3ffb357063bf00fca82184b575..cade684d40d6a09ad8c00e73b5de2b18a164896f 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 f3c18b1def92571984bc00e6897b06547a825b02..966beaed8e01ceed8d88f1ac01532639874ea03f 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 47688082fa61a31565491a3cfd705a6dab88d7e8..65969a5512339a59f8b32bc75d0d744f36201969 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 bcb8d36df3df4a7bbc9f9e106fb9b28d6d6be110..709f50c81f9f6fadbde541ca22bd13057a2daa6d 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 9e8c8edcd870ab245d94c46b8650244438b3023a..a19b8e05cae2a2ab1f8df3fd432486ecd87d0d7f 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 678fada81b0a8c3cfa0a314b47792da1873fb9ef..c37dd1089c1aeb6afcc62502952ca4a7ca6a3927 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 5f0fa3db289c091272a8ca0d52a7fe77d5c17d21..0d3a7f639bd9db50ee6f088150a7d4c3799666ab 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 983686b6b41b8ac696c85da1893e348bb858481f..e0a49e2f54311df811db70dc8b391bff2788bb0e 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 fef54c96b8dcaa0436b5577f5abf6aa7fe6f5191..5dea91a629e829a783c3521ae1112b53d9a078de 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 8c9e1d4bdebe65ce8667744712b34382b6c92c64..4a7a6ae92106b78bfab845ce61734d057672f288 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 36dc23c97a3a7a76690e29913a931db227b453aa..29a0c5fd46248814d3f73926856c444199ddaeed 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 9988776dff2464577e66eb13043f6b951ac208bc..7e875e1b68bd2378232d2e80314a9efc68dc959b 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 050ddca7f67c7067148e59179b23c1a1d4b8f63c..051b2a8a7e25c09e829b2d798d94d08e4abe0980 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 4c2f6a154ee8f230efa05a0c0ab2d02ce84f48c0..69a79f9ae3bd2138207bff43d36ceaf65c5a4842 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 1151447953e0cbc02975849998e7f23091b121a8..152021a1bc4b0d6f593e3c97eab71b1359a145f2 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 06eebbd7da9fcdb60215087edbd61748cccda376..8e2590654927ffa47c59934c770de38f2ca7fd6f 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 b5692b1cdf23457c1008ea290a3d12d004edcd20..f7c3800b59c1db5e9c8e136e684994323519b1a4 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 b2174482556a5870d23f649baaad98e7725ca68f..73ab9e8f89f8696f2c76f992d11861abc1652d6c 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 88c06621f74e085e819d1279961b9c53e20631b5..99684a6c6a84245d44bbc5c7d87cfd8f95698461 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 c67398f7080932ef2075d548c14e108a9f23ce68..a7c31440808cc8933c55abe5afffa199356abe3e 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 e3fa549c9894158309fe19ddb725f50ae41ae1ba..df01004fdd1b66a360f455b9936808926bced7d9 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 293f6968fc5a579ab03dfe14fd8bf87c4146cd9c..fbd5e27765b304550e8ca6ccf44451f9770d0820 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 a511aaa6362a659410da664b49762c42237ebfee..7f5a957f9ef4b1f514107e1c3932918df9f2ebbb 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 683eb900382f5dcfbb18f57bbce6a7d70a3e0951..29e2fdc25e9bbacc376bd6b127f91ae5252056a7 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 92ed4dbfa6a6fe4ab07f11ea4d46702321366675..e71237849a092a0739ff4540966dfc8528648d1d 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 bbbc32b806bd02048793b67897a66e35bdd05ee4..e0a01a07643d28c3c25e518221902e1373d32a99 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 32ca3f8425c765c440395f2602c1d1f9b9afeb00..e285af4064003c6edeb29d119af5f60c52323686 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 b6590d692cb1987f7163c1c20bbc74aa03b5f61f..1b28cff11581ca4bb9a19697d309bac504509b15 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 9a1fbea83bd88f1e1d4ed5862573db1756c256f1..eb7dfd0bfb162660c67d21f1b85884edfd3ab663 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 baed97720b169985a8850ec2aa359219856819bd..2e6d20bd846726afeeaee1c90368053bb00274b2 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 eecbfe596cb2fe70314b3a211d576aa0fdece014..a35df0d2f481a3ebb9bd03f239da362f80ebdcfc 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 093182a9ef189e51cc3f27cd278b92e05c2c27ec..8cf154fb1b85bc65fe7e886be7a69d86ab52dbed 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 9197734fff4e13a4c857496f3d3dd01173223afe..c4bb2b1e19e73cd09a0a6bd15720885bbe09c19a 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 ae5f7a9ff2f1cb0b6f770983bc9df6477b09f754..6554bfd3732a231c5b3c0702ab6f993f63b0bd86 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 957e749d67ed3a0cd8ebb920015b337c1474b03c..495c10a5c00685f5d97b4df3375a03c142a51df9 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 d09232bd04e0d2c39d4ba29a3c74f3d56e57101b..69c0d1971e1f51f3605d14e9f473d697c295fcf4 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 98caf9eb4116b9d33842224b758a67619c1484cb..8a0bb2e67b3b6de1c7f73ec43019648249c4adac 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 fcbb33b2f20ae4bc4f145e92932e669c1a39d0f2..af89ce7dc51182ab4a2fc3dc5d758ee92b3b1187 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 d2b8e05b3084be921f51092b83da388c1439be2d..f941c1fac0a5170de4dbceafa53b9b421ece6f10 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 fae8df8886e475e1b1c613bdf341003a93ceec20..8ba8c8514a619e2007bdd70ae6bb4b6372892a85 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 acbe8beb5f1ba47382f83f6b5944fc3cd1714bc5..addcefd69566c760169c0a14be3a280c34f4991e 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 016faaed3d8468587adcae40d4040442ccd3a360..561d4bbb0c779fa1275533951299d6cf629aee44 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 3a4d4b210a7245ff62b827d4d7ca422f884bf765..df67a9d9f9899bb5fa2e22c9189fd1f5881b6f66 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 6e65fbb9739ead1d9fd069782a07f3bb4d82c63c..c4bbad191ddbe305acd8f34444074b0e8aabc21d 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 215e04a151ed35133d411504227d16c56d3597fd..c5869fc4daa96ac4724ac76e27210294c6919c36 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 86ff179c3641577745a76660ec85657dac66a504..3bab1646745e671c5da931bc1f492066a476301d 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 914837317ca006a518b6735909ad929965147d6d..25ad3c13de46441965e061f546ab0683a53e245c 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 b7e7a51e26dc4cb1db4b838a6d4f49f0f06be5ea..87cc5259f5427f0d3f856f579750bfd9322c1688 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 90a01d345b2f2bb45c271a969b9fe52b042cbdde..a8480ac3157089dbab82b2b86a2491c2ae9bdd5e 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 e485d8010a97a7ac6295417e008817171ecd4856..ce2858baba834075b68f92055cebb60c08d62d1c 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 b51d89e3e2d2852a47d2aafa7c4274adfb670414..76da8dc035750145a80dab89499a1e867fe31c01 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 4cfaf710e6383b30e45c7244fd81c9a8977d33dc..1006c2c5bfa516ee18aa1162728a7d17b325fa29 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 edbf6eb1211b05160a407daa4759cfd6b2d520c4..c69dee5132a01191ed7c3fae0a13c9fb796e347f 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 ab1814965cf7cb5190e7e240b83536412c691af7..00ab0eacb78eaee514fbe0a563c4af3e3b4a36dd 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 e686bda9e580028b6c5f3ddbf5f28a8e80583016..8ae455dc01105fad566605b85e34373269be7b56 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 d97927ffc2dde58363ec0b1efb10693e255defbc..3fe91178acae5090b54d1075023dead375eeaf57 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 f5c1eb39c73edae2bfa0e1c495343dc0615bb59f..4deb78e7952215b5eb1b7ef967e3ea687aad49f8 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 54a83835bca8cd6623269ddd3307268e0fd3a398..9f133d685a7ee7f52ce1cee26716749469313306 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 ad25678e7fd863f4a44486454b0d274c82d8e9c0..73a5f5388e9323bfce2b416d6176aef595deb6cc 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 cd045acf2fb016e02175ecbb5bd6d17c5cec10eb..71a9921cadb3098b3b394aaaef4bbc1f89d9cb14 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 948ac261a6dc9e8c82fe9f35acffc7b84ffd8b71..a170a97104118a1d238e2e5ab9d607844826277a 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 df1da4d1abfe00dacb3af97ae9bcc89e58eb2c50..867a4b1ef11a129acb82f14e6ff1f1fb8a8806b4 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 7078ba72e7e2fea86822c530496f7cb76ad35278..dbde3903df3a86fa0daa65672acc6e5811fb332c 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 804d881db75d5450ca972c96dcd021847198f2ea..c86bf3c2b66386292a3d0f58cd182a74207493a2 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 560516938e48c740eb6f6990a3ffdf9306aeafed..610ff78b7c3513240df3ffc2cffb722fa16c6f32 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 77f0d3bc554ab03781d907a742ede089732fbfa0..5fdb3988060d920d0924b3940822690fcac1fd51 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 4c2ae67623e8dc77f050258e168301f0e6c68fed..6afbe6030fa8cfb28757a26b9c6d4b477b2127d8 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 de11f76062703d79553c55dcbd795b452a1b95d5..55211a2163a2af1cb8d1d1dd070975d70dccbd90 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 7a346a0abd6fc7f92ed02bcae0baed722de38249..abc6344c92900f796c2f45611801d17c19089596 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 22ade04c5919e9fa66b8132cad16b787b53550af..7a63adc9e98626dfca8ca464ebedab3ea17b19c0 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 a420f93304b927f735d7c3f21d1d29a7b83bbedd..d3b80b67abba7b998dc8b741a4f5fdf4b518af48 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 159551f7e83d181f5dd23e327d9926668d333695..a5609cac27a3b0be82a764873fde86ac888ece13 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 39545d6f09f28de58611628724b23d79998e6bb6..ddeb26bd7bbc15d1470595e2d6ad769498a76395 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 5ac3dfad4f7323f852c68e8a6613e856658dbd0c..9b59ab56a1557ec5d026dcfe1f861988414abe0d 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 7ec2e2ff77e6a980ec8c24233184a380af9aad46..f45212e4af635914bb36fbd9b6e40ab03df02c6f 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 ff46b4587fe980fd6980fa8fa7e66debd88963ea..e40d5e3c74400df92ab0d5d6b49dff410e4cc4d3 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 9e6168fe7ff30ccb1ba389c029762243fbdb23a2..408f9d7b10274d35ef60156481cb08f58dda9876 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 48f16e9d9413c27a75d9cb9fcf681eff3a14cb0d..9f96611bd2910f5174eb33b50868a63a29cb010a 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 cc484c1e04a8d0237875327bea86bf77cf5c50f2..303b43fe178e3d15390bb35029be38e410932893 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 83398e881a7f50707cae1959bf03eaf8d901a3db..96fad33bda1f7561fb78d8214c095f9b01e8988e 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 e555d1ec4e7a8376de67bcb7d16f007beb04ccd7..d83d5ad7adb6b29050e5a9777437b509006278f7 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 63e573523f203f80dd35354adffed495fd4e4b68..fcb2bb984aad189f636909f384c6190dc4206b49 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 260fe28766ef4c521435815087e0135c782d0dd4..be9de6d11ef97281fe4d2031ceb3c68dad0f9190 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 fac3ade5ef45a46de2c5a56b207d7a1fd38931de..1dafc2bd4f21d3618f30ee4768d4e2e352a2d7ca 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 3587cf64bd6b80e402ab5a5ea425f139bfed4172..8c559e944d0ae09bacd2003dd8dc7876936ddde2 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 20fd05f5f5e1206d75f7cd0b9ccaacbce9f1adad..8dbd116360903ce68c91312e0f20a02dbd39f51b 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 24a395c6403e40e7de65496650f2d7b7f0e69498..a352ea5fe4c635758f2f5fa41800d5f75746e7ae 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 a5c59e9cb08ea0a9b8a079e2bed90ab963038e62..ec0146497dc8fd6220c7a6cf986a2ecd8a89b37f 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 a635d13c4137c495d07807fe7dc54a1f46c6784d..921f0503ed104b10fc4e4d3172784fb86804b14f 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);