Replace runTestCase with assert helpers [test/built-ins/Array/prototype/forEach]

140 files changed, 243 insertions, 852 deletions

diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-0-1.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-0-1.js
index 2a86f42cd..4bee8a861 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-0-1.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-0-1.js
@@ -4,13 +4,8 @@
 /*---
 es5id: 15.4.4.18-0-1
 description: Array.prototype.forEach must exist as a function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var f = Array.prototype.forEach;
-  if (typeof(f) === "function") {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(typeof(f), "function", 'typeof(f)');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-0-2.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-0-2.js
index a1dde4453..149383e81 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-0-2.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-0-2.js
@@ -4,12 +4,6 @@
 /*---
 es5id: 15.4.4.18-0-2
 description: Array.prototype.forEach.length must be 1
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if (Array.prototype.forEach.length === 1) {
-    return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Array.prototype.forEach.length, 1, 'Array.prototype.forEach.length');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-11.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-11.js
index 534bb02cf..eb9d6390d 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-11.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-11.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-1-11
 description: Array.prototype.forEach applied to Date object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = obj instanceof Date;
@@ -18,6 +16,5 @@ function testcase() {
         obj[0] = 1;
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-12.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-12.js
index c3b6e4feb..66677cea4 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-12.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-12.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-1-12
 description: Array.prototype.forEach applied to RegExp object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = obj instanceof RegExp;
@@ -18,6 +16,5 @@ function testcase() {
         obj[0] = 1;
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-14.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-14.js
index 0e25232d2..55e376ff4 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-14.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-14.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-1-14
 description: Array.prototype.forEach applied to Error object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = obj instanceof Error;
@@ -18,6 +16,5 @@ function testcase() {
         obj[0] = 1;
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-15.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-15.js
index d7ed8f8fc..31d500db1 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-15.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-15.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-1-15
 description: Array.prototype.forEach applied to the Arguments object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = ('[object Arguments]' === Object.prototype.toString.call(obj));
@@ -18,6 +16,5 @@ function testcase() {
         }("a", "b"));
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-4.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-4.js
index 502c4c429..9197acb9b 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-4.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-4.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-1-4
 description: Array.prototype.forEach applied to Boolean object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = obj instanceof Boolean;
@@ -19,6 +17,5 @@ function testcase() {
         obj[1] = 12;
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-6.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-6.js
index db3acbf6f..a6df4fc9c 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-6.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-6.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-1-6
 description: Array.prototype.forEach applied to Number object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = obj instanceof Number;
@@ -20,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return result;
-    }
-runTestCase(testcase);
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-7.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-7.js
index a32acb2e7..928d23072 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-7.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-7.js
@@ -4,16 +4,13 @@
 /*---
 es5id: 15.4.4.18-1-7
 description: Array.prototype.forEach applied to string primitive
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = obj instanceof String;
         }
 
         Array.prototype.forEach.call("abc", callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-8.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-8.js
index 04e4f73af..1b33e88b8 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-8.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-8.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-1-8
 description: Array.prototype.forEach applied to String object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = obj instanceof String;
@@ -16,6 +14,4 @@ function testcase() {
         var obj = new String("abc");
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return result;
-    }
-runTestCase(testcase);
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-9.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-9.js
index c58be365f..599819bfa 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-1-9.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-1-9.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-1-9
 description: Array.prototype.forEach applied to Function object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = obj instanceof Function;
@@ -20,6 +18,5 @@ function testcase() {
         obj[1] = 9;
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-1.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-1.js
index 33660e3da..39c891f51 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-1.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-1.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-1
 description: >
     Array.prototype.forEach - 'length' is own data property on an
     Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -23,6 +21,5 @@ function testcase() {
         };
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-10.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-10.js
index f850c9de7..a4ccbbe0f 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-10.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-10.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-10
 description: >
     Array.prototype.forEach applied to Array-like object, 'length' is
     an inherited accessor property
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -33,6 +31,5 @@ function testcase() {
         child[2] = 9;
 
         Array.prototype.forEach.call(child, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-11.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-11.js
index 6a9a4e10a..7283486ac 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-11.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-11.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-2-11
 description: >
     Array.prototype.forEach applied to Array-like object, 'length' is
     an own accessor property without a get function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
         function callbackfn(val, idx, obj) {
             accessed = true;
@@ -26,6 +23,5 @@ function testcase() {
         });
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return !accessed;
-    }
-runTestCase(testcase);
+
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-13.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-13.js
index 5c2008fd1..9cb70467a 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-13.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-13.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-2-13
 description: >
     Array.prototype.forEach applied to the Array-like object that
     'length' is inherited accessor property without a get function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -31,6 +28,5 @@ function testcase() {
         child[1] = 12;
 
         Array.prototype.forEach.call(child, callbackfn);
-        return !accessed;
-    }
-runTestCase(testcase);
+
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-14.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-14.js
index b638e805d..9a884eb63 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-14.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-14.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-2-14
 description: >
     Array.prototype.forEach applied to the Array-like object that
     'length' property doesn't exist
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -20,7 +17,5 @@ function testcase() {
         var obj = { 0: 11, 1: 12 };
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return !accessed;
 
-    }
-runTestCase(testcase);
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-17.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-17.js
index dd718f6ae..5e77499e9 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-17.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-17.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-17
 description: >
     Array.prototype.forEach applied to the Arguments object, which
     implements its own property get method
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -21,6 +19,4 @@ function testcase() {
             return result;
         };
 
-        return func(12, 11);
-    }
-runTestCase(testcase);
+assert(func(12, 11), 'func(12, 11) !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-18.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-18.js
index b3d55f6a0..1e63e1652 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-18.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-18.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-18
 description: >
     Array.prototype.forEach applied to String object, which implements
     its own property get method
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 3);
@@ -18,6 +16,5 @@ function testcase() {
         var str = new String("012");
 
         Array.prototype.forEach.call(str, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-19.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-19.js
index 45628c3ea..6714929e5 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-19.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-19.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-19
 description: >
     Array.prototype.forEach applied to Function object, which
     implements its own property get method
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -23,6 +21,5 @@ function testcase() {
         fun[2] = 9;
 
         Array.prototype.forEach.call(fun, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-2.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-2.js
index d598ae4b4..e8bd3cc58 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-2.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-2.js
@@ -4,16 +4,13 @@
 /*---
 es5id: 15.4.4.18-2-2
 description: Array.prototype.forEach - 'length' is own data property on an Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
         }
 
         [12, 11].forEach(callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-3.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-3.js
index 02f7b1bd3..740525fc5 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-3.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-3.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-3
 description: >
     Array.prototype.forEach - 'length' is an own data property that
     overrides an inherited data property on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -27,6 +25,5 @@ function testcase() {
         child[2] = 9;
 
         Array.prototype.forEach.call(child, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-5.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-5.js
index e6b35e524..f0a8fa20f 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-5.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-5.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-5
 description: >
     Array.prototype.forEach applied to Array-like object, 'length' is
     an own data property that overrides an inherited accessor property
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -37,6 +35,5 @@ function testcase() {
         child[2] = 9;
 
         Array.prototype.forEach.call(child, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-6.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-6.js
index e3121c0aa..6562b8c69 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-6.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-6.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-6
 description: >
     Array.prototype.forEach applied to Array-like object, 'length' is
     an inherited data property
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -26,6 +24,5 @@ function testcase() {
         child[2] = 9;
 
         Array.prototype.forEach.call(child, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-7.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-7.js
index 499d3391e..4ba3bf094 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-7.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-7.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-7
 description: >
     Array.prototype.forEach applied to Array-like object, 'length' is
     an own accessor property
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -29,6 +27,5 @@ function testcase() {
         obj[2] = 9;
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-8.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-8.js
index 5aff37c00..a7ac4344b 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-8.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-8.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-2-8
 description: >
     Array.prototype.forEach applied to Array-like object, 'length' is
     an own accessor property that overrides an inherited data property
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -34,6 +32,5 @@ function testcase() {
         child[2] = 9;
 
         Array.prototype.forEach.call(child, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-9.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-9.js
index 22e0b90a9..09a9cbb48 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-2-9.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-2-9.js
@@ -7,10 +7,8 @@ description: >
     Array.prototype.forEach applied to Array-like object, 'length' is
     an own accessor property that overrides an inherited accessor
     property
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
@@ -42,6 +40,5 @@ function testcase() {
         child[2] = 9;
 
         Array.prototype.forEach.call(child, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-1.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-1.js
index 889c14538..f8cbc2571 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-1.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-1.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-3-1
 description: Array.prototype.forEach - value of 'length' is undefined
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -19,6 +16,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !accessed;
-    }
-runTestCase(testcase);
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-10.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-10.js
index df903bc50..046d9b187 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-10.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-10.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-10
 description: >
     Array.prototype.forEach - value of 'length' is a number (value is
     NaN)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !accessed;
-    }
-runTestCase(testcase);
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-11.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-11.js
index 7763ff742..c463fc5ea 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-11.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-11.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-11
 description: >
     Array.prototype.forEach - 'length' is a string containing a
     positive number
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-12.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-12.js
index be5b1ea76..e106d2f18 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-12.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-12.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-12
 description: >
     Array.prototype.forEach - 'length' is a string containing a
     negative number
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !testResult;
-    }
-runTestCase(testcase);
+assert.sameValue(testResult, false, 'testResult');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-13.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-13.js
index 2832f0941..c13bd9dcc 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-13.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-13.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-13
 description: >
     Array.prototype.forEach - 'length' is a string containing a
     decimal number
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -20,6 +17,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-14.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-14.js
index 80aaba769..a627bcd0c 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-14.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-14.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-3-14
 description: Array.prototype.forEach - 'length' is a string containing -Infinity
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed2 = false;
 
         function callbackfn2(val, idx, obj) {
@@ -19,6 +16,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj2, callbackfn2);
 
-        return !accessed2;
-    }
-runTestCase(testcase);
+assert.sameValue(accessed2, false, 'accessed2');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-15.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-15.js
index 7d3590e91..00f5179d6 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-15.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-15.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-15
 description: >
     Array.prototype.forEach - 'length' is a string containing an
     exponential number
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -20,6 +17,5 @@ function testcase() {
         var obj = { 1: 11, 2: 9, length: "2E0" };
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return testResult;
-    }
-runTestCase(testcase);
+
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-16.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-16.js
index c74f9c068..d1ce1e54c 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-16.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-16.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-16
 description: >
     Array.prototype.forEach - 'length' is a string containing a hex
     number
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-17.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-17.js
index 7d28d2bb8..d11b52f5f 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-17.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-17.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-17
 description: >
     Array.prototype.forEach - 'length' is a string containing a number
     with leading zeros
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-18.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-18.js
index f756482a9..6b5c38602 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-18.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-18.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-18
 description: >
     Array.prototype.forEach - value of 'length' is a string that can't
     convert to a number
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !accessed;
-    }
-runTestCase(testcase);
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-19.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-19.js
index 6c9cb1382..3c4e8c0bf 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-19.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-19.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-19
 description: >
     Array.prototype.forEach - value of 'length' is an Object which has
     an own toString method.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -29,6 +26,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-2.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-2.js
index c244fe1fe..91db62edb 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-2.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-2.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-2
 description: >
     Array.prototype.forEach - value of 'length' is a boolean (value is
     true)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
         function callbackfn(val, idx, obj) {
             testResult = (val > 10);
@@ -20,6 +17,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-20.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-20.js
index 14948f4c4..1f6adf5de 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-20.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-20.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-20
 description: >
     Array.prototype.forEach - value of 'length' is an Object which has
     an own valueOf method.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -29,6 +26,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-21.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-21.js
index 08b780a29..88392289f 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-21.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-21.js
@@ -7,11 +7,8 @@ description: >
     Array.prototype.forEach - 'length' is an object that has an own
     valueOf method that returns an object and toString method that
     returns a string
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
         var firstStepOccured = false;
         var secondStepOccured = false;
@@ -37,6 +34,6 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult && firstStepOccured && secondStepOccured;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
+assert(firstStepOccured, 'firstStepOccured !== true');
+assert(secondStepOccured, 'secondStepOccured !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-23.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-23.js
index b53338d4a..4f0108971 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-23.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-23.js
@@ -7,11 +7,8 @@ description: >
     Array.prototype.forEach uses inherited valueOf method when
     'length' is an object with an own toString and inherited valueOf
     methods
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
         var valueOfAccessed = false;
         var toStringAccessed = false;
@@ -45,6 +42,6 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult && valueOfAccessed && !toStringAccessed;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
+assert(valueOfAccessed, 'valueOfAccessed !== true');
+assert.sameValue(toStringAccessed, false, 'toStringAccessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-24.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-24.js
index bcb2d69db..fab3ea451 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-24.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-24.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-24
 description: >
     Array.prototype.forEach - value of 'length' is a positive
     non-integer, ensure truncation occurs in the proper direction
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -25,6 +22,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-25.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-25.js
index f7d45fa52..84187be7b 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-25.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-25.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-25
 description: >
     Array.prototype.forEach - value of 'length' is a negative
     non-integer
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -25,6 +22,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !testResult;
-    }
-runTestCase(testcase);
+assert.sameValue(testResult, false, 'testResult');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-3.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-3.js
index 48e0e9e18..8f6639a42 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-3.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-3.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-3
 description: >
     Array.prototype.forEach - value of 'length' is a number (value is
     0)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !accessed;
-    }
-runTestCase(testcase);
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-4.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-4.js
index 1f69b3f0c..324469cf7 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-4.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-4.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-4
 description: >
     Array.prototype.forEach - value of 'length' is a number (value is
     +0)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !accessed;
-    }
-runTestCase(testcase);
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-5.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-5.js
index f1d5b9057..78ffd1ea2 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-5.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-5.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-5
 description: >
     Array.prototype.forEach - value of 'length' is a number (value is
     -0)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !accessed;
-    }
-runTestCase(testcase);
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-6.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-6.js
index b79604644..9ce1ab500 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-6.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-6.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-6
 description: >
     Array.prototype.forEach - value of 'length' is a number (value is
     positive)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult1 = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult1;
-    }
-runTestCase(testcase);
+assert(testResult1, 'testResult1 !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-7.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-7.js
index 35247a798..181d6d70b 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-7.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-7.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-7
 description: >
     Array.prototype.forEach - value of 'length' is a number (value is
     negative)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult1 = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !testResult1;
-    }
-runTestCase(testcase);
+assert.sameValue(testResult1, false, 'testResult1');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-9.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-9.js
index 49edfad15..ef607572c 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-3-9.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-3-9.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-3-9
 description: >
     Array.prototype.forEach - value of 'length' is a number (value is
     -Infinity)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return !accessed;
-    }
-runTestCase(testcase);
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-4-12.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-4-12.js
index 06d75fc32..b15cf3321 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-4-12.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-4-12.js
@@ -4,17 +4,13 @@
 /*---
 es5id: 15.4.4.18-4-12
 description: Array.prototype.forEach - 'callbackfn' is a function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
         function callbackfn(val, idx, obj) {
             accessed = true;
         }
 
         [11, 9].forEach(callbackfn);
-        return accessed;
-    }
-runTestCase(testcase);
+
+assert(accessed, 'accessed !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-1-s.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-1-s.js
index 032de30bd..5583689ca 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-1-s.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-1-s.js
@@ -5,10 +5,8 @@
 es5id: 15.4.4.18-5-1-s
 description: Array.prototype.forEach - thisArg not passed to strict callbackfn
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var innerThisCorrect = false;
   
   function callbackfn(val, idx, obj) {
@@ -18,6 +16,5 @@ function testcase() {
   }
 
   [1].forEach(callbackfn);
-  return innerThisCorrect;    
- }
-runTestCase(testcase);
+
+assert(innerThisCorrect, 'innerThisCorrect !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-10.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-10.js
index 770915bd9..ffae109d9 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-10.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-10.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-10
 description: Array.prototype.forEach - Array Object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var objArray = [];
 
@@ -17,6 +14,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, objArray);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-11.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-11.js
index 9b7cef78b..020875376 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-11.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-11.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-11
 description: Array.prototype.forEach - String Object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var objString = new String();
 
@@ -17,6 +14,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, objString);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-12.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-12.js
index b22740ab9..c1dfb85c1 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-12.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-12.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-12
 description: Array.prototype.forEach - Boolean Object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var objBoolean = new Boolean();
 
@@ -17,6 +14,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, objBoolean);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-13.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-13.js
index 9ff249b5c..4fd60ef83 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-13.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-13.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-13
 description: Array.prototype.forEach - Number Object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var objNumber = new Number();
 
@@ -17,6 +14,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, objNumber);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-14.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-14.js
index 6e7314764..dc5fd5a1a 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-14.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-14.js
@@ -4,17 +4,13 @@
 /*---
 es5id: 15.4.4.18-5-14
 description: Array.prototype.forEach - the Math object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (this === Math);
         }
 
         [11].forEach(callbackfn, Math);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-15.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-15.js
index 264fa1b9d..2ea8d3ad5 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-15.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-15.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-15
 description: Array.prototype.forEach - Date Object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var objDate = new Date();
 
@@ -17,6 +14,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, objDate);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-16.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-16.js
index 70cd3c86c..41fe5b6a9 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-16.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-16.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-16
 description: Array.prototype.forEach - RegExp Object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var objRegExp = new RegExp();
 
@@ -17,6 +14,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, objRegExp);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-17.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-17.js
index 4b2ce5301..5eb3554e9 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-17.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-17.js
@@ -4,17 +4,13 @@
 /*---
 es5id: 15.4.4.18-5-17
 description: Array.prototype.forEach - the JSON object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (this === JSON);
         }
 
         [11].forEach(callbackfn, JSON);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-18.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-18.js
index ef7635230..760ab064c 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-18.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-18.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-18
 description: Array.prototype.forEach - Error Object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var objError = new RangeError();
 
@@ -17,6 +14,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, objError);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-19.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-19.js
index 8566a9048..2b93fd04b 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-19.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-19.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-5-19
 description: >
     Array.prototype.forEach - the Arguments object can be used as
     thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var arg;
 
@@ -23,6 +20,5 @@ function testcase() {
         }(1, 2, 3));
 
         [11].forEach(callbackfn, arg);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-2.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-2.js
index f593633db..1fa6f2047 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-2.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-2.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-2
 description: Array.prototype.forEach - thisArg is Object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var res = false;
   var o = new Object();
   o.res = true;
@@ -19,8 +17,5 @@ function testcase() {
 
   var arr = [1];
   arr.forEach(callbackfn,o)
-  if( result === true)
-    return true;    
 
- }
-runTestCase(testcase);
+assert.sameValue(result, true, 'result');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-21.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-21.js
index 9c148b8d8..a33397907 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-21.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-21.js
@@ -4,19 +4,14 @@
 /*---
 es5id: 15.4.4.18-5-21
 description: Array.prototype.forEach - the global object can be used as thisArg
-includes:
-    - runTestCase.js
-    - fnGlobalObject.js
+includes: [fnGlobalObject.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (this === fnGlobalObject());
         }
 
         [11].forEach(callbackfn, fnGlobalObject());
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-22.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-22.js
index 2b1ee1483..2c3b9c3b4 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-22.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-22.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-22
 description: Array.prototype.forEach - boolean primitive can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
 
         function callbackfn(val, idx, obj) {
@@ -16,6 +13,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, false);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-23.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-23.js
index 363da88ad..4132f0677 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-23.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-23.js
@@ -4,17 +4,13 @@
 /*---
 es5id: 15.4.4.18-5-23
 description: Array.prototype.forEach - number primitive can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (this.valueOf() === 101);
         }
 
         [11].forEach(callbackfn, 101);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-24.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-24.js
index e3d51f27d..7c67a188f 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-24.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-24.js
@@ -4,17 +4,13 @@
 /*---
 es5id: 15.4.4.18-5-24
 description: Array.prototype.forEach - string primitive can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (this.valueOf() === "abc");
         }
 
         [11].forEach(callbackfn, "abc");
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-25.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-25.js
index 66d8c13c3..6be4d43ca 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-25.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-25.js
@@ -5,10 +5,8 @@
 es5id: 15.4.4.18-5-25
 description: Array.prototype.forEach - thisArg not passed
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         function innerObj() {
             this._15_4_4_18_5_25 = true;
             var _15_4_4_18_5_25 = false;
@@ -20,6 +18,5 @@ function testcase() {
             arr.forEach(callbackfn)
             this.retVal = !result;
         }
-        return new innerObj().retVal;
-    }
-runTestCase(testcase);
+
+assert(new innerObj().retVal, 'new innerObj().retVal !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-3.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-3.js
index 4926c6819..1fc3c5897 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-3.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-3.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-3
 description: Array.prototype.forEach - thisArg is Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var res = false;
   var a = new Array();
   a.res = true;
@@ -19,8 +17,5 @@ function testcase() {
 
   var arr = [1];
   arr.forEach(callbackfn,a)
-  if( result === true)
-    return true;    
 
- }
-runTestCase(testcase);
+assert.sameValue(result, true, 'result');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-4.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-4.js
index 217576e78..80d781f5d 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-4.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-4.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-5-4
 description: >
     Array.prototype.forEach - thisArg is object from object
     template(prototype)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var res = false;
   var result;
   function callbackfn(val, idx, obj)
@@ -22,8 +20,5 @@ function testcase() {
   var f = new foo();
   var arr = [1];
   arr.forEach(callbackfn,f)
-  if( result === true)
-    return true;    
 
- }
-runTestCase(testcase);
+assert.sameValue(result, true, 'result');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-5.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-5.js
index bf4009ab0..9159a2eac 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-5.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-5.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-5
 description: Array.prototype.forEach - thisArg is object from object template
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var res = false;
   var result;
   function callbackfn(val, idx, obj)
@@ -21,8 +19,5 @@ function testcase() {
   
   var arr = [1];
   arr.forEach(callbackfn,f)
-  if( result === true)
-    return true;    
 
- }
-runTestCase(testcase);
+assert.sameValue(result, true, 'result');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-6.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-6.js
index af0edefc7..c80661177 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-6.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-6.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-6
 description: Array.prototype.forEach - thisArg is function
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var res = false;
   var result;
   function callbackfn(val, idx, obj)
@@ -20,8 +18,5 @@ function testcase() {
   
   var arr = [1];
   arr.forEach(callbackfn,foo)
-  if( result === true)
-    return true;    
 
- }
-runTestCase(testcase);
+assert.sameValue(result, true, 'result');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-7.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-7.js
index 46ed9b3df..14cd7aec4 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-7.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-7.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-7
 description: Array.prototype.forEach - built-in functions can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
 
         function callbackfn(val, idx, obj) {
@@ -16,6 +13,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, eval);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-9.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-9.js
index 008d2f3a5..18d1f36a8 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-5-9.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-5-9.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-5-9
 description: Array.prototype.forEach - Function Object can be used as thisArg
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var objString = function () { };
 
@@ -17,6 +14,5 @@ function testcase() {
         }
 
         [11].forEach(callbackfn, objString);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-1.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-1.js
index a616d26d2..8710bd141 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-1.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-1.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-1
 description: >
     Array.prototype.forEach doesn't consider new elements added to
     array after the call
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   var callCnt = 0;
   function callbackfn(val, idx, obj)
   {
@@ -21,7 +18,5 @@ function testcase() {
 
   var arr = [1,2,,4,5];
   arr.forEach(callbackfn);
-  if( callCnt === 5)    
-    return true;
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 5, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-2.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-2.js
index 323d88d96..a48d14563 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-2.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-2.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-2
 description: >
     Array.prototype.forEach doesn't visit deleted elements in array
     after the call
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   var callCnt = 0;
   function callbackfn(val, idx, obj)
   {
@@ -21,8 +18,5 @@ function testcase() {
 
   var arr = [1,2,3,4,5];
   arr.forEach(callbackfn)
-  if( callCnt === 4)    
-      return true;  
-  
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 4, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-3.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-3.js
index 2f643efcc..9710342cd 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-3.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-3.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-3
 description: >
     Array.prototype.forEach doesn't visit deleted elements when
     Array.length is decreased
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   var callCnt = 0;
   function callbackfn(val, idx, obj)
   {
@@ -20,8 +17,5 @@ function testcase() {
 
   var arr = [1,2,3,4,5];
   arr.forEach(callbackfn);
-  if( callCnt === 3)    
-      return true;  
-  
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 3, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-4.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-4.js
index ba632b2e7..9394e7d5f 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-4.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-4.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-4
 description: >
     Array.prototype.forEach doesn't consider newly added elements in
     sparse array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   var callCnt = 0;
   function callbackfn(val, idx, obj)
   {
@@ -22,8 +19,5 @@ function testcase() {
   arr[1] = 1;
   arr[2] = 2;
   arr.forEach(callbackfn);
-  if( callCnt === 2)    
-      return true;  
-  
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 2, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-5.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-5.js
index d8c938f68..186f94fb9 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-5.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-5.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-5
 description: >
     Array.prototype.forEach visits deleted element in array after the
     call when same index is also present in prototype
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   var callCnt = 0;
   function callbackfn(val, idx, obj)
   {
@@ -23,8 +20,5 @@ function testcase() {
   var arr = [1,2,3,4,5];
   arr.forEach(callbackfn)
   delete Array.prototype[4];
-  if( callCnt === 5)    
-      return true;  
-  
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 5, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-7.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-7.js
index 0ce280ffa..67691e700 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-7.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-7.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-7
 description: >
     Array.prototype.forEach - considers new value of elements in array
     after the call
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var arr = [1, 2, 3, 4, 5];
 
@@ -22,6 +19,5 @@ function testcase() {
         }
 
         arr.forEach(callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-8.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-8.js
index 738c7f530..417e267f7 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-8.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-8.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-7-8
 description: Array.prototype.forEach - no observable effects occur if len is 0
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
@@ -17,6 +15,5 @@ function testcase() {
         var obj = { 0: 11, 1: 12, length: 0 };
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return !accessed;
-    }
-runTestCase(testcase);
+
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-9.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-9.js
index 128b91c98..00418300a 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-9.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-9.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-9
 description: >
     Array.prototype.forEach - modifications to length don't change
     number of iterations
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var called = 0;
         function callbackfn(val, idx, obj) {
             called++;
@@ -27,6 +24,5 @@ function testcase() {
         });
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return 2 === called;
-    }
-runTestCase(testcase);
+
+assert.sameValue(called, 2, 'called');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-1.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-1.js
index 0b8631b39..ee403d8c0 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-1.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-1.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-b-1
 description: >
     Array.prototype.forEach - callbackfn not called for indexes never
     been assigned values
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   var callCnt = 0;
   function callbackfn(val, idx, obj)
   {
@@ -20,7 +17,5 @@ function testcase() {
   var arr = new Array(10);
   arr[1] = undefined;
   arr.forEach(callbackfn);
-  if( callCnt === 1)    
-    return true;    
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 1, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-14.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-14.js
index d4b4f023a..23c882a61 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-14.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-14.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-b-14
 description: >
     Array.prototype.forEach - decreasing length of array causes index
     property not to be visited
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
         var testResult = true;
 
@@ -33,6 +30,5 @@ function testcase() {
 
         arr.forEach(callbackfn);
 
-        return testResult && accessed;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
+assert(accessed, 'accessed !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-16.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-16.js
index 6f0594ff9..288bdca0a 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-16.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-16.js
@@ -7,11 +7,8 @@ description: >
     Array.prototype.forEach - decreasing length of array does not
     delete non-configurable properties
 flags: [noStrict]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -39,6 +36,4 @@ function testcase() {
 
         arr.forEach(callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-2.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-2.js
index b59a90144..eb4c4d731 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-2.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-2.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-b-2
 description: >
     Array.prototype.forEach - added properties in step 2 are visible
     here
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -31,6 +28,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-3.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-3.js
index f767f3e79..fca6c7e9d 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-3.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-3.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-b-3
 description: >
     Array.prototype.forEach - deleted properties in step 2 are visible
     here
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
         var testResult = true;
 
@@ -31,6 +28,6 @@ function testcase() {
         });
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return testResult && accessed;
-    }
-runTestCase(testcase);
+
+assert(testResult, 'testResult !== true');
+assert(accessed, 'accessed !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-4.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-4.js
index a0debd956..d8f9cd1fe 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-4.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-4.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-b-4
 description: >
     Array.prototype.forEach - properties added into own object after
     current position are visited on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -35,6 +32,5 @@ function testcase() {
         });
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return testResult;
-    }
-runTestCase(testcase);
+
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-5.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-5.js
index 96d63c8d1..501ee6fd8 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-5.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-5.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-b-5
 description: >
     Array.prototype.forEach - properties added into own object after
     current position are visited on an Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -35,6 +32,5 @@ function testcase() {
         });
 
         arr.forEach(callbackfn);
-        return testResult;
-    }
-runTestCase(testcase);
+
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-8.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-8.js
index 335289dea..1009f4758 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-8.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-8.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-b-8
 description: >
     Array.prototype.forEach - deleting own property causes index
     property not to be visited on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
         var testResult = true;
 
@@ -39,6 +36,6 @@ function testcase() {
         });
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return testResult && accessed;
-    }
-runTestCase(testcase);
+
+assert(testResult, 'testResult !== true');
+assert(accessed, 'accessed !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-9.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-9.js
index be90d079c..f5e66c6ce 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-9.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-b-9.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-b-9
 description: >
     Array.prototype.forEach - deleting own property causes index
     property not to be visited on an Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
         var testResult = true;
 
@@ -39,6 +36,6 @@ function testcase() {
         });
 
         arr.forEach(callbackfn);
-        return testResult && accessed;
-    }
-runTestCase(testcase);
+
+assert(testResult, 'testResult !== true');
+assert(accessed, 'accessed !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-1.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-1.js
index 9dde0bb79..ae3db45a3 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-1.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-1.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-1
 description: >
     Array.prototype.forEach - element to be retrieved is own data
     property on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var kValue = { };
         var testResult = false;
 
@@ -24,6 +21,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-10.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-10.js
index 103cda86a..9456a8ee1 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-10.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-10.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-10
 description: >
     Array.prototype.forEach - element to be retrieved is own accessor
     property on an Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -30,6 +27,4 @@ function testcase() {
 
         arr.forEach(callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-11.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-11.js
index b01b2f960..2891f135a 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-11.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-11.js
@@ -7,11 +7,8 @@ description: >
     Array.prototype.forEach - element to be retrieved is own accessor
     property that overrides an inherited data property on an
     Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -37,6 +34,4 @@ function testcase() {
 
         Array.prototype.forEach.call(child, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-13.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-13.js
index 31e7cb1b0..985d6d5d6 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-13.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-13.js
@@ -7,11 +7,8 @@ description: >
     Array.prototype.forEach - element to be retrieved is own accessor
     property that overrides an inherited accessor property on an
     Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -45,6 +42,4 @@ function testcase() {
 
         Array.prototype.forEach.call(child, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-15.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-15.js
index e203b84e5..610e74c52 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-15.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-15.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-15
 description: >
     Array.prototype.forEach - element to be retrieved is inherited
     accessor property on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -36,6 +33,4 @@ function testcase() {
 
         Array.prototype.forEach.call(child, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-17.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-17.js
index c9019038c..9d1a28117 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-17.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-17.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-17
 description: >
     Array.prototype.forEach - element to be retrieved is own accessor
     property without a get function on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -27,6 +24,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-18.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-18.js
index 13d8f682b..8450ff847 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-18.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-18.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-18
 description: >
     Array.prototype.forEach - element to be retrieved is own accessor
     property without a get function on an Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -28,6 +25,4 @@ function testcase() {
 
         arr.forEach(callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-2.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-2.js
index b566d65d2..91259c219 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-2.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-2.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-2
 description: >
     Array.prototype.forEach - element to be retrieved is own data
     property on an Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,4 @@ function testcase() {
 
         [11].forEach(callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-21.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-21.js
index 8c0777b27..c3c4e307a 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-21.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-21.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-21
 description: >
     Array.prototype.forEach - element to be retrieved is inherited
     accessor property without a get function on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -33,6 +30,4 @@ function testcase() {
 
         Array.prototype.forEach.call(child, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-25.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-25.js
index 754d666b1..0df252871 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-25.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-25.js
@@ -7,11 +7,8 @@ description: >
     Array.prototype.forEach - This object is the Arguments object
     which implements its own property get method (number of arguments
     is less than number of parameters)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -26,6 +23,4 @@ function testcase() {
 
         func(11);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-26.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-26.js
index 34f86fa85..b3db7c3b6 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-26.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-26.js
@@ -7,11 +7,8 @@ description: >
     Array.prototype.forEach - This object is the Arguments object
     which implements its own property get method (number of arguments
     equals number of parameters)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var called = 0;
         var testResult = false;
 
@@ -35,6 +32,4 @@ function testcase() {
 
         func(11, 9);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-27.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-27.js
index 79e14ac4e..c2ef2da70 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-27.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-27.js
@@ -7,11 +7,8 @@ description: >
     Array.prototype.forEach - This object is the Arguments object
     which implements its own property get method (number of arguments
     is greater than number of parameters)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var called = 0;
         var testResult = false;
 
@@ -37,6 +34,4 @@ function testcase() {
 
         func(11, 12, 9);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-28.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-28.js
index 56a12e93b..e7d67553a 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-28.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-28.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-28
 description: >
     Array.prototype.forEach - element changed by getter on previous
     iterations is observed on an Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var preIterVisible = false;
         var arr = [];
         var testResult = false;
@@ -42,6 +39,4 @@ function testcase() {
 
         arr.forEach(callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-29.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-29.js
index ab242334d..c351de143 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-29.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-29.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-29
 description: >
     Array.prototype.forEach - element changed by getter on previous
     iterations is observed on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var preIterVisible = false;
         var obj = { length: 2 };
         var testResult = false;
@@ -42,6 +39,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-3.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-3.js
index 67bf4d84b..b91bdcc18 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-3.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-3.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-3
 description: >
     Array.prototype.forEach - element to be retrieved is own data
     property that overrides an inherited data property on an Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var kValue = "abc";
         var testResult = false;
 
@@ -31,6 +28,4 @@ function testcase() {
 
         Array.prototype.forEach.call(child, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-5.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-5.js
index 2ffe61dcd..1d807b94c 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-5.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-5.js
@@ -7,11 +7,8 @@ description: >
     Array.prototype.forEach - element to be retrieved is own data
     property that overrides an inherited accessor property on an
     Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -41,6 +38,4 @@ function testcase() {
 
         Array.prototype.forEach.call(child, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-7.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-7.js
index 5b0f7b65a..8a4742a83 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-7.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-7.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-7
 description: >
     Array.prototype.forEach - element to be retrieved is inherited
     data property on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var kValue = 'abc';
         var testResult = false;
 
@@ -30,6 +27,4 @@ function testcase() {
 
         Array.prototype.forEach.call(child, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-9.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-9.js
index dcab8ab87..770b1f9b2 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-9.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-9.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-i-9
 description: >
     Array.prototype.forEach - element to be retrieved is own accessor
     property on an Array-like object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var testResult = false;
 
         function callbackfn(val, idx, obj) {
@@ -30,6 +27,4 @@ function testcase() {
 
         Array.prototype.forEach.call(obj, callbackfn);
 
-        return testResult;
-    }
-runTestCase(testcase);
+assert(testResult, 'testResult !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-1.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-1.js
index 6c370fccf..57df71775 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-1.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-1.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-7-c-ii-1
 description: Array.prototype.forEach - callbackfn called with correct parameters
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   var bPar = true;
   var bCalled = false;
   function callbackfn(val, idx, obj)
@@ -21,7 +18,6 @@ function testcase() {
   var arr = [0,1,true,null,new Object(),"five"];
   arr[999999] = -6.6;
   arr.forEach(callbackfn);
-  if(bCalled === true && bPar === true)
-    return true;
- }
-runTestCase(testcase);
+
+assert.sameValue(bCalled, true, 'bCalled');
+assert.sameValue(bPar, true, 'bPar');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-10.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-10.js
index b4802aee4..e8f6e69da 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-10.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-10.js
@@ -6,17 +6,13 @@ es5id: 15.4.4.18-7-c-ii-10
 description: >
     Array.prototype.forEach - callbackfn is called with 1 formal
     parameter
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val) {
             result = (val > 10);
         }
 
         [11].forEach(callbackfn); 
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-11.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-11.js
index c89a80e2f..424436ded 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-11.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-11.js
@@ -6,17 +6,13 @@ es5id: 15.4.4.18-7-c-ii-11
 description: >
     Array.prototype.forEach - callbackfn is called with 2 formal
     parameter
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx) {
             result = (val > 10 && arguments[2][idx] === val);
         }
 
         [11].forEach(callbackfn); 
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-12.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-12.js
index aafa401ee..fc9fc9428 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-12.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-12.js
@@ -6,17 +6,13 @@ es5id: 15.4.4.18-7-c-ii-12
 description: >
     Array.prototype.forEach - callbackfn is called with 3 formal
     parameter
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (val > 10 && obj[idx] === val);
         }
 
         [11].forEach(callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-13.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-13.js
index 6946afa15..831901ee2 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-13.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-13.js
@@ -4,17 +4,13 @@
 /*---
 es5id: 15.4.4.18-7-c-ii-13
 description: Array.prototype.forEach - callbackfn that uses arguments
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn() {
             result = (arguments[2][arguments[1]] === arguments[0]);
         }
 
         [11].forEach(callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-16.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-16.js
index e75001b19..cf464b5cb 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-16.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-16.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-16
 description: >
     Array.prototype.forEach - 'this' of 'callbackfn' is a Boolean
     object when T is not an object (T is a boolean)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (this.valueOf() !== false);
@@ -19,6 +16,5 @@ function testcase() {
         var obj = { 0: 11, length: 2 };
 
         Array.prototype.forEach.call(obj, callbackfn, false);
-        return !result;
-    }
-runTestCase(testcase);
+
+assert.sameValue(result, false, 'result');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-17.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-17.js
index 192fa78c8..c23ff9bc2 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-17.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-17.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-17
 description: >
     Array.prototype.forEach - 'this' of 'callbackfn' is a Number
     object when T is not an object (T is a number)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, o) {
             result = (5 === this.valueOf());
@@ -19,6 +16,5 @@ function testcase() {
         var obj = { 0: 11, length: 2 };
 
         Array.prototype.forEach.call(obj, callbackfn, 5);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-18.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-18.js
index 4d48350ac..6eda43be3 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-18.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-18.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-18
 description: >
     Array.prototype.forEach - 'this' of 'callbackfn' is an String
     object when T is not an object (T is a string)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, obj) {
             result = ('hello' === this.valueOf());
@@ -19,6 +16,5 @@ function testcase() {
         var obj = { 0: 11, length: 2 };
 
         Array.prototype.forEach.call(obj, callbackfn, "hello");
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-19.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-19.js
index 04acf59b9..61b7068a4 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-19.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-19.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-7-c-ii-19
 description: Array.prototype.forEach - non-indexed properties are not called
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
         var result = true;
         function callbackfn(val, idx, obj) {
@@ -21,6 +18,6 @@ function testcase() {
         var obj = { 0: 11, 10: 12, non_index_property: 8, length: 20 };
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result && accessed;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
+assert(accessed, 'accessed !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-2.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-2.js
index d3e1c0e8b..511e78e93 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-2.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-2.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-7-c-ii-2
 description: Array.prototype.forEach - callbackfn takes 3 arguments
-includes: [runTestCase.js]
 ---*/
 
-function testcase() { 
- 
   var parCnt = 3;
   var bCalled = false
   function callbackfn(val, idx, obj)
@@ -20,8 +17,6 @@ function testcase() {
 
   var arr = [0,1,2,3,4,5,6,7,8,9];
   arr.forEach(callbackfn);
-  if(bCalled === true && parCnt === 3)
-    return true;
 
- }
-runTestCase(testcase);
+assert.sameValue(bCalled, true, 'bCalled');
+assert.sameValue(parCnt, 3, 'parCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-20.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-20.js
index 68f748399..fad988f40 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-20.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-20.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-20
 description: >
     Array.prototype.forEach - callbackfn called with correct
     parameters (thisArg is correct)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (10 === this.threshold);
@@ -21,6 +18,5 @@ function testcase() {
         var obj = { 0: 11, length: 1 };
 
         Array.prototype.forEach.call(obj, callbackfn, thisArg);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-21.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-21.js
index 58c70d062..083cb472e 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-21.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-21.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-21
 description: >
     Array.prototype.forEach - callbackfn called with correct
     parameters (kValue is correct)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var resultOne = false;
         var resultTwo = false;
 
@@ -28,6 +25,6 @@ function testcase() {
         var obj = { 0: 11, 1: 12, length: 2 };
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return resultOne && resultTwo;
-    }
-runTestCase(testcase);
+
+assert(resultOne, 'resultOne !== true');
+assert(resultTwo, 'resultTwo !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-22.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-22.js
index cf95ebab8..9a7cafcda 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-22.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-22.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-22
 description: >
     Array.prototype.forEach - callbackfn called with correct
     parameters (the index k is correct)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var resultOne = false;
         var resultTwo = false;
 
@@ -28,6 +25,6 @@ function testcase() {
         var obj = { 0: 11, 1: 12, length: 2 };
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return resultOne && resultTwo;
-    }
-runTestCase(testcase);
+
+assert(resultOne, 'resultOne !== true');
+assert(resultTwo, 'resultTwo !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-23.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-23.js
index 19dbd5b7a..2e68805d5 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-23.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-23.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-23
 description: >
     Array.prototype.forEach - callbackfn called with correct
     parameters (this object O is correct)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var obj = { 0: 11, length: 2 };
 
@@ -19,6 +16,5 @@ function testcase() {
         }
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-4.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-4.js
index e172cc39d..8360e0798 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-4.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-4.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-4
 description: >
     Array.prototype.forEach - k values are passed in ascending numeric
     order
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var arr = [0, 1, 2, 3, 4, 5];
         var lastIdx = 0;
         var called = 0;
@@ -25,6 +22,6 @@ function testcase() {
         }
 
         arr.forEach(callbackfn);
-        return result && arr.length === called;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
+assert.sameValue(arr.length, called, 'arr.length');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-5.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-5.js
index edfbfcca9..d3a583616 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-5.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-5.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-5
 description: >
     Array.prototype.forEach - k values are accessed during each
     iteration and not prior to starting the loop on an Array
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = true;
         var kIndex = [];
 
@@ -30,6 +27,4 @@ function testcase() {
 
         [11, 12, 13, 14].forEach(callbackfn, undefined);
 
-        return result;
-    }
-runTestCase(testcase);
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-6.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-6.js
index a01650faf..836d290fe 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-6.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-6.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-6
 description: >
     Array.prototype.forEach - arguments to callbackfn are self
     consistent
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var obj = { 0: 11, length: 1 };
         var thisArg = {};
@@ -23,6 +20,5 @@ function testcase() {
         }
 
         Array.prototype.forEach.call(obj, callbackfn, thisArg);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-8.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-8.js
index f16d7d91c..9ca0fbe8d 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-8.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-8.js
@@ -6,11 +6,8 @@ es5id: 15.4.4.18-7-c-ii-8
 description: >
     Array.prototype.forEach - element changed by callbackfn on
     previous iterations is observed
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var result = false;
         var obj = { 0: 11, 1: 12, length: 2 };
 
@@ -25,6 +22,5 @@ function testcase() {
         }
 
         Array.prototype.forEach.call(obj, callbackfn);
-        return result;
-    }
-runTestCase(testcase);
+
+assert(result, 'result !== true');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-9.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-9.js
index dd5d6817e..d5da08c29 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-9.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-ii-9.js
@@ -6,17 +6,13 @@ es5id: 15.4.4.18-7-c-ii-9
 description: >
     Array.prototype.forEach - callbackfn is called with 0 formal
     parameter
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var called = 0;
         function callbackfn() {
             called++;
         }
 
         [11, 12].forEach(callbackfn);
-        return 2 === called;
-    }
-runTestCase(testcase);
+
+assert.sameValue(called, 2, 'called');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-1.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-1.js
index 4cac2b885..1ed233338 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-1.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-1.js
@@ -6,15 +6,10 @@ es5id: 15.4.4.18-8-1
 description: >
     Array.prototype.forEach doesn't call callbackfn if 'length' is 0
     (empty array)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = [].forEach(cb);
-  if (callCnt === 0) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 0, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-10.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-10.js
index 44ab26590..383c8ce08 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-10.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-10.js
@@ -4,10 +4,8 @@
 /*---
 es5id: 15.4.4.18-8-10
 description: Array.prototype.forEach - subclassed array when length is reduced
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   foo.prototype = new Array(1, 2, 3);
   function foo() {}
   var f = new foo();
@@ -16,8 +14,5 @@ function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = f.forEach(cb);  
-  if (callCnt === 1) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 1, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-11.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-11.js
index e73457fc2..228694dc4 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-11.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-11.js
@@ -6,25 +6,17 @@ es5id: 15.4.4.18-8-11
 description: >
     Array.prototype.forEach doesn't mutate the array on which it is
     called on
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
   function callbackfn(val, idx, obj)
   {
     return true;
   }
   var arr = [1,2,3,4,5];
   arr.forEach(callbackfn);
-  if(arr[0] === 1 &&
-     arr[1] === 2 &&
-     arr[2] === 3 &&
-     arr[3] === 4 &&
-     arr[4] === 5)
-  {
-    return true;
-  }
 
- }
-runTestCase(testcase);
+assert.sameValue(arr[0], 1, 'arr[0]');
+assert.sameValue(arr[1], 2, 'arr[1]');
+assert.sameValue(arr[2], 3, 'arr[2]');
+assert.sameValue(arr[3], 4, 'arr[3]');
+assert.sameValue(arr[4], 5, 'arr[4]');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-12.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-12.js
index 261ee1ded..0e7c1c4ba 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-12.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-12.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.4.4.18-8-12
 description: Array.prototype.forEach doesn't visit expandos
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
   var callCnt = 0;
   function callbackfn(val, idx, obj)
   {
@@ -19,10 +16,5 @@ function testcase() {
   arr[true] = 11;
 
   arr.forEach(callbackfn);
-  if(callCnt == 5)
-  {
-    return true;
-  }
 
- }
-runTestCase(testcase);
+assert.sameValue(callCnt, 5, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-13.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-13.js
index c12b7b76b..f33b5b89e 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-13.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-13.js
@@ -6,17 +6,14 @@ es5id: 15.4.4.18-8-13
 description: >
     Array.prototype.forEach - undefined will be returned when 'len' is
     0
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
         var accessed = false;
         function callbackfn(val, idx, obj) {
             accessed = true;
         }
 
         var result = [].forEach(callbackfn);
-        return typeof result === "undefined" && !accessed;
-    }
-runTestCase(testcase);
+
+assert.sameValue(typeof result, "undefined", 'typeof result');
+assert.sameValue(accessed, false, 'accessed');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-2.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-2.js
index 645d578f9..d0c99e08d 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-2.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-2.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-8-2
 description: >
     Array.prototype.forEach doesn't call callbackfn if 'length' is 0
     (subclassed Array, length overridden to null (type conversion))
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   foo.prototype = new Array(1, 2, 3);
   function foo() {}
   var f = new foo();
@@ -18,8 +16,5 @@ function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = f.forEach(cb);  
-  if (callCnt === 0) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 0, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-3.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-3.js
index 2d9e5be25..ea5a05018 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-3.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-3.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-8-3
 description: >
     Array.prototype.forEach doesn't call callbackfn if 'length' is 0
     (subclassed Array, length overridden to false (type conversion))
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   foo.prototype = new Array(1, 2, 3);
   function foo() {}
   var f = new foo();
@@ -18,8 +16,5 @@ function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = f.forEach(cb);  
-  if (callCnt === 0) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 0, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-4.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-4.js
index a98a5c0c3..ff273dc4c 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-4.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-4.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-8-4
 description: >
     Array.prototype.forEach doesn't call callbackfn if 'length' is 0
     (subclassed Array, length overridden to 0 (type conversion))
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   foo.prototype = new Array(1, 2, 3);
   function foo() {}
   var f = new foo();
@@ -18,8 +16,5 @@ function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = f.forEach(cb);  
-  if (callCnt === 0) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 0, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-5.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-5.js
index 8a2650fcf..b6c1bb45f 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-5.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-5.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-8-5
 description: >
     Array.prototype.forEach doesn't call callbackfn if 'length' is 0
     (subclassed Array, length overridden to '0' (type conversion))
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   foo.prototype = new Array(1, 2, 3);
   function foo() {}
   var f = new foo();
@@ -18,8 +16,5 @@ function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = f.forEach(cb);  
-  if (callCnt === 0) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 0, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-6.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-6.js
index 83517efc4..6a430109f 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-6.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-6.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-8-6
 description: >
     Array.prototype.forEach doesn't call callbackfn if 'length' is 0
     (subclassed Array, length overridden with obj with valueOf)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   foo.prototype = new Array(1, 2, 3);
   function foo() {}
   var f = new foo();
@@ -20,8 +18,5 @@ function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = f.forEach(cb);  
-  if (callCnt === 0) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 0, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-7.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-7.js
index 9aeda2e43..da408aa1d 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-7.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-7.js
@@ -7,10 +7,8 @@ description: >
     Array.prototype.forEach doesn't call callbackfn if 'length' is 0
     (subclassed Array, length overridden with obj w/o valueOf
     (toString))
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   foo.prototype = new Array(1, 2, 3);
   function foo() {}
   var f = new foo();
@@ -26,8 +24,5 @@ function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = f.forEach(cb);  
-  if (callCnt === 0) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 0, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-8.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-8.js
index a0381d510..42ab786e2 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-8.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-8.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-8-8
 description: >
     Array.prototype.forEach doesn't call callbackfn if 'length' is 0
     (subclassed Array, length overridden with []
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   foo.prototype = new Array(1, 2, 3);
   function foo() {}
   var f = new foo();
@@ -32,8 +30,5 @@ function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = f.forEach(cb);  
-  if (callCnt === 0) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 0, 'callCnt');
diff --git a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-9.js b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-9.js
index 5ac069ab6..801e84765 100644
--- a/test/built-ins/Array/prototype/forEach/15.4.4.18-8-9.js
+++ b/test/built-ins/Array/prototype/forEach/15.4.4.18-8-9.js
@@ -6,10 +6,8 @@ es5id: 15.4.4.18-8-9
 description: >
     Array.prototype.forEach doesn't call callbackfn if 'length' is 0
     (subclassed Array, length overridden with [0]
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   foo.prototype = new Array(1, 2, 3);
   function foo() {}
   var f = new foo();
@@ -33,8 +31,5 @@ function testcase() {
   var callCnt = 0;
   function cb(){callCnt++}
   var i = f.forEach(cb);  
-  if (callCnt === 0) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(callCnt, 0, 'callCnt');