Replace runTestCase with assert helpers [test/built-ins/Object]

56 files changed, 59 insertions, 333 deletions

diff --git a/test/built-ins/Object/prototype/15.2.3.1.js b/test/built-ins/Object/prototype/15.2.3.1.js
index 905d9fda3..fb0ddee7f 100644
--- a/test/built-ins/Object/prototype/15.2.3.1.js
+++ b/test/built-ins/Object/prototype/15.2.3.1.js
@@ -6,15 +6,10 @@ es5id: 15.2.3.1
 description: >
     Object.prototype is a data property with default attribute values
     (false)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var desc = Object.getOwnPropertyDescriptor(Object, 'prototype');
-  if (desc.writable === false &&
-      desc.enumerable === false &&
-      desc.configurable === false) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(desc.writable, false, 'desc.writable');
+assert.sameValue(desc.enumerable, false, 'desc.enumerable');
+assert.sameValue(desc.configurable, false, 'desc.configurable');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_1.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_1.js
index 740b332c2..29e824587 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_1.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_1.js
@@ -4,13 +4,8 @@
 /*---
 es5id: 8.12.1-1_1
 description: Properties - [[HasOwnProperty]] (property does not exist)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_10.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_10.js
index 7a952e209..0e5e905e3 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_10.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_10.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_10
 description: >
     Properties - [[HasOwnProperty]] (writable, configurable,
     non-enumerable own value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {value: 42, writable:true, configurable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_11.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_11.js
index c727864a8..d4f3d3903 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_11.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_11.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_11
 description: >
     Properties - [[HasOwnProperty]] (writable, configurable,
     enumerable own value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {value: 42, writable:true, enumerable:true, configurable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_12.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_12.js
index 61430376a..99004855e 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_12.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_12.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_12
 description: >
     Properties - [[HasOwnProperty]] (non-writable, non-configurable,
     non-enumerable inherited value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {value: 42});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_13.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_13.js
index 8d28021a0..c12d0c344 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_13.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_13.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_13
 description: >
     Properties - [[HasOwnProperty]] (non-writable, non-configurable,
     enumerable inherited value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {value: 42, enumerable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_14.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_14.js
index c0044b7ae..0dcb8a61a 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_14.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_14.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_14
 description: >
     Properties - [[HasOwnProperty]] (non-writable, configurable,
     non-enumerable inherited value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {value: 42, configurable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_15.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_15.js
index 9882fc304..54baa8f1a 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_15.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_15.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_15
 description: >
     Properties - [[HasOwnProperty]] (writable, non-configurable,
     non-enumerable inherited value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {value: 42, writable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_16.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_16.js
index b50b015df..6474f7f80 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_16.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_16.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_16
 description: >
     Properties - [[HasOwnProperty]] (non-writable, configurable,
     enumerable inherited value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {value: 42, configurable:true, enumerable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_17.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_17.js
index cbb545f80..ac6c14ab3 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_17.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_17.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_17
 description: >
     Properties - [[HasOwnProperty]] (writable, non-configurable,
     enumerable inherited value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {value: 42, writable:true, enumerable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_18.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_18.js
index ac3d45e67..8b8120c5c 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_18.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_18.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_18
 description: >
     Properties - [[HasOwnProperty]] (writable, configurable,
     non-enumerable inherited value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {value: 42, writable:true, configurable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_19.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_19.js
index 2afc809f3..6eec46644 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_19.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_19.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_19
 description: >
     Properties - [[HasOwnProperty]] (writable, configurable,
     enumerable inherited value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {value: 42, writable:true, enumerable:true, configurable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_2.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_2.js
index 3fd23a59f..9e51b6eb9 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_2.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_2.js
@@ -4,13 +4,8 @@
 /*---
 es5id: 8.12.1-1_2
 description: Properties - [[HasOwnProperty]] (old style own property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {foo: 42};
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_20.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_20.js
index 4c317ce8a..4c6c466f3 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_20.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_20.js
@@ -4,13 +4,8 @@
 /*---
 es5id: 8.12.1-1_20
 description: Properties - [[HasOwnProperty]] (literal own getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = { get foo() { return 42;} };
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_21.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_21.js
index e0378aba2..aa8236e3b 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_21.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_21.js
@@ -4,13 +4,8 @@
 /*---
 es5id: 8.12.1-1_21
 description: Properties - [[HasOwnProperty]] (literal own setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = { set foo(x) {;} };
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_22.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_22.js
index aec7dec5d..b23a22bfc 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_22.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_22.js
@@ -6,13 +6,8 @@ es5id: 8.12.1-1_22
 description: >
     Properties - [[HasOwnProperty]] (literal own getter/setter
     property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = { get foo() { return 42;}, set foo(x) {;} };
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_23.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_23.js
index 7fe6e85ef..4e2587b1c 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_23.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_23.js
@@ -4,14 +4,9 @@
 /*---
 es5id: 8.12.1-1_23
 description: Properties - [[HasOwnProperty]] (literal inherited getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = { get foo() { return 42;} };
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_24.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_24.js
index 59a8f25bc..cf1cac60b 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_24.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_24.js
@@ -4,14 +4,9 @@
 /*---
 es5id: 8.12.1-1_24
 description: Properties - [[HasOwnProperty]] (literal inherited setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = { set foo(x) {;} };
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_25.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_25.js
index 6e07b92a2..fdb1e6d3a 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_25.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_25.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_25
 description: >
     Properties - [[HasOwnProperty]] (literal inherited getter/setter
     property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = { get foo() { return 42;}, set foo(x) {;} };
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_26.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_26.js
index 79cf21fda..fd15435b5 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_26.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_26.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_26
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
     own getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {get: function() {return 42;}});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_27.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_27.js
index 83d6f6ae8..6d8b4634d 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_27.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_27.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_27
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, enumerable own
     getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {get: function() {return 42;}, enumerable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_28.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_28.js
index 9ff6d7988..19bcb8142 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_28.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_28.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_28
 description: >
     Properties - [[HasOwnProperty]] (configurable, non-enumerable own
     getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {get: function() {return 42;}, configurable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_29.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_29.js
index 9fc23c599..01587705d 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_29.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_29.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_29
 description: >
     Properties - [[HasOwnProperty]] (configurable, enumerable own
     getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {get: function() {return 42;}, enumerable:true, configurable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_3.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_3.js
index 63c51f986..8c851da5a 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_3.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_3.js
@@ -4,14 +4,9 @@
 /*---
 es5id: 8.12.1-1_3
 description: Properties - [[HasOwnProperty]] (old style inherited property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {foo:42};
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_30.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_30.js
index 5d5eeecfb..5d12f52ff 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_30.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_30.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_30
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
     own setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {set: function() {;}});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_31.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_31.js
index 16d5d9a07..0e9e30575 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_31.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_31.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_31
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, enumerable own
     setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {set: function() {;}, enumerable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_32.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_32.js
index 0e6a204f8..f0a345b0b 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_32.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_32.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_32
 description: >
     Properties - [[HasOwnProperty]] (configurable, non-enumerable own
     setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {set: function() {;}, configurable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_33.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_33.js
index 22df23074..1b7e60c21 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_33.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_33.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_33
 description: >
     Properties - [[HasOwnProperty]] (configurable, enumerable own
     setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {set: function() {;}, enumerable:true, configurable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_34.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_34.js
index a915b5101..2b34bf9b6 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_34.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_34.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_34
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
     own getter/setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_35.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_35.js
index 29f0e5822..01ef0ead2 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_35.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_35.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_35
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, enumerable own
     getter/setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_36.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_36.js
index 918f4617f..a07762869 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_36.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_36.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_36
 description: >
     Properties - [[HasOwnProperty]] (configurable, non-enumerable own
     getter/setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}, configurable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_37.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_37.js
index c9fd7a852..1938b5a2c 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_37.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_37.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_37
 description: >
     Properties - [[HasOwnProperty]] (configurable, enumerable own
     getter/setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true, configurable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_38.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_38.js
index dc8a53bde..801ecdaee 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_38.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_38.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_38
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
     inherited getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {get: function() {return 42;}});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_39.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_39.js
index 5ff0e64df..5a0e15903 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_39.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_39.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_39
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, enumerable
     inherited getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {get: function() {return 42;}, enumerable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_4.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_4.js
index 892f68407..dac63b029 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_4.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_4.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_4
 description: >
     Properties - [[HasOwnProperty]] (non-writable, non-configurable,
     non-enumerable own value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {value: 42});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_40.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_40.js
index d73fd07d3..a04fd4369 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_40.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_40.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_40
 description: >
     Properties - [[HasOwnProperty]] (configurable, non-enumerable
     inherited getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {get: function() {return 42;}, configurable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_41.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_41.js
index 4b53d9ad6..bf0dbd47d 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_41.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_41.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_41
 description: >
     Properties - [[HasOwnProperty]] (configurable, enumerable
     inherited getter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {get: function() {return 42;}, enumerable:true, configurable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_42.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_42.js
index 6b1c1f6f6..97bab311f 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_42.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_42.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_42
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
     inherited setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {set: function() {;}});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_43.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_43.js
index 9648fe37f..baa392b1f 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_43.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_43.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_43
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, enumerable
     inherited setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {set: function() {;}, enumerable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_44.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_44.js
index d5809d6a6..07b368234 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_44.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_44.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_44
 description: >
     Properties - [[HasOwnProperty]] (configurable, non-enumerable
     inherited setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {set: function() {;}, configurable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_45.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_45.js
index 7f1609047..68c0517cc 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_45.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_45.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_45
 description: >
     Properties - [[HasOwnProperty]] (configurable, enumerable
     inherited setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {set: function() {;}, enumerable:true, configurable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_46.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_46.js
index 6ab9572e9..1ff589a9b 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_46.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_46.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_46
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
     inherited getter/setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_47.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_47.js
index a2f40e01c..16bc5d71b 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_47.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_47.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_47
 description: >
     Properties - [[HasOwnProperty]] (non-configurable, enumerable
     inherited getter/setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_48.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_48.js
index 2574083c9..0a9c741ff 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_48.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_48.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_48
 description: >
     Properties - [[HasOwnProperty]] (configurable, non-enumerable
     inherited getter/setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}, configurable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_49.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_49.js
index 52f1a538b..d492e9ee8 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_49.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_49.js
@@ -6,15 +6,10 @@ es5id: 8.12.1-1_49
 description: >
     Properties - [[HasOwnProperty]] (configurable, enumerable
     inherited getter/setter property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var base = {};
     Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true, configurable:true});
     var o = Object.create(base);
-    return o.hasOwnProperty("foo")===false;
 
-}
-runTestCase(testcase);
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_5.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_5.js
index f8d4525dc..19d6229e9 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_5.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_5.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_5
 description: >
     Properties - [[HasOwnProperty]] (non-writable, non-configurable,
     enumerable own value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {value: 42, enumerable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_6.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_6.js
index 31a9a83cb..76bd5649c 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_6.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_6.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_6
 description: >
     Properties - [[HasOwnProperty]] (non-writable, configurable,
     non-enumerable own value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {value: 42, configurable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_7.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_7.js
index 0e50a6990..8c6ea6884 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_7.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_7.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_7
 description: >
     Properties - [[HasOwnProperty]] (writable, non-configurable,
     non-enumerable own value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {value: 42, writable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_8.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_8.js
index 12cfec2b7..384f1c801 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_8.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_8.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_8
 description: >
     Properties - [[HasOwnProperty]] (non-writable, configurable,
     enumerable own value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {value: 42, configurable:true, enumerable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_9.js b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_9.js
index 478fcbf0d..e17903b7c 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_9.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/8.12.1-1_9.js
@@ -6,14 +6,9 @@ es5id: 8.12.1-1_9
 description: >
     Properties - [[HasOwnProperty]] (writable, non-configurable,
     enumerable own value property)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-
     var o = {};
     Object.defineProperty(o, "foo", {value: 42, writable:true, enumerable:true});
-    return o.hasOwnProperty("foo");
 
-}
-runTestCase(testcase);
+assert(o.hasOwnProperty("foo"), 'o.hasOwnProperty("foo") !== true');
diff --git a/test/built-ins/Object/prototype/toString/15.2.4.2-1-1.js b/test/built-ins/Object/prototype/toString/15.2.4.2-1-1.js
index 9e7131ac4..801dfbaf6 100644
--- a/test/built-ins/Object/prototype/toString/15.2.4.2-1-1.js
+++ b/test/built-ins/Object/prototype/toString/15.2.4.2-1-1.js
@@ -6,10 +6,6 @@ es5id: 15.2.4.2-1-1
 description: >
     Object.prototype.toString - '[object Undefined]' will be returned
     when 'this' value is undefined
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        return Object.prototype.toString.call(undefined) === "[object Undefined]";
-    }
-runTestCase(testcase);
+assert.sameValue(Object.prototype.toString.call(undefined), "[object Undefined]", 'Object.prototype.toString.call(undefined)');
diff --git a/test/built-ins/Object/prototype/toString/15.2.4.2-1-2.js b/test/built-ins/Object/prototype/toString/15.2.4.2-1-2.js
index bcec70206..c6daf2500 100644
--- a/test/built-ins/Object/prototype/toString/15.2.4.2-1-2.js
+++ b/test/built-ins/Object/prototype/toString/15.2.4.2-1-2.js
@@ -6,10 +6,6 @@ es5id: 15.2.4.2-1-2
 description: >
     Object.prototype.toString - '[object Undefined]' will be returned
     when 'this' value is undefined
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        return Object.prototype.toString.apply(undefined, []) === "[object Undefined]";
-    }
-runTestCase(testcase);
+assert.sameValue(Object.prototype.toString.apply(undefined, []), "[object Undefined]", 'Object.prototype.toString.apply(undefined, [])');
diff --git a/test/built-ins/Object/prototype/toString/15.2.4.2-2-1.js b/test/built-ins/Object/prototype/toString/15.2.4.2-2-1.js
index 6bc291ddb..ee6120a79 100644
--- a/test/built-ins/Object/prototype/toString/15.2.4.2-2-1.js
+++ b/test/built-ins/Object/prototype/toString/15.2.4.2-2-1.js
@@ -6,10 +6,6 @@ es5id: 15.2.4.2-2-1
 description: >
     Object.prototype.toString - '[object Null]' will be returned when
     'this' value is null
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        return Object.prototype.toString.call(null) === "[object Null]";
-    }
-runTestCase(testcase);
+assert.sameValue(Object.prototype.toString.call(null), "[object Null]", 'Object.prototype.toString.call(null)');
diff --git a/test/built-ins/Object/prototype/toString/15.2.4.2-2-2.js b/test/built-ins/Object/prototype/toString/15.2.4.2-2-2.js
index 5f0f42dc6..194597ab0 100644
--- a/test/built-ins/Object/prototype/toString/15.2.4.2-2-2.js
+++ b/test/built-ins/Object/prototype/toString/15.2.4.2-2-2.js
@@ -6,10 +6,6 @@ es5id: 15.2.4.2-2-2
 description: >
     Object.prototype.toString - '[object Null]' will be returned when
     'this' value is null
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        return Object.prototype.toString.apply(null, []) === "[object Null]";
-    }
-runTestCase(testcase);
+assert.sameValue(Object.prototype.toString.apply(null, []), "[object Null]", 'Object.prototype.toString.apply(null, [])');
diff --git a/test/built-ins/Object/prototype/valueOf/15.2.4.4-1.js b/test/built-ins/Object/prototype/valueOf/15.2.4.4-1.js
index e4dff48e1..8686aab85 100644
--- a/test/built-ins/Object/prototype/valueOf/15.2.4.4-1.js
+++ b/test/built-ins/Object/prototype/valueOf/15.2.4.4-1.js
@@ -6,10 +6,6 @@ es5id: 15.2.4.4-1
 description: >
     Object.prototype.valueOf - typeof
     Object.prototype.valueOf.call(true)==="object"
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        return (typeof Object.prototype.valueOf.call(true)) === "object";
-}
-runTestCase(testcase);
+assert.sameValue(typeof Object.prototype.valueOf.call(true), "object", 'typeof Object.prototype.valueOf.call(true)');
diff --git a/test/built-ins/Object/prototype/valueOf/15.2.4.4-2.js b/test/built-ins/Object/prototype/valueOf/15.2.4.4-2.js
index 8a216344d..bab367e17 100644
--- a/test/built-ins/Object/prototype/valueOf/15.2.4.4-2.js
+++ b/test/built-ins/Object/prototype/valueOf/15.2.4.4-2.js
@@ -6,10 +6,6 @@ es5id: 15.2.4.4-2
 description: >
     Object.prototype.valueOf - typeof
     Object.prototype.valueOf.call(false)==="object"
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-        return (typeof Object.prototype.valueOf.call(false)) === "object";
-}
-runTestCase(testcase);
+assert.sameValue(typeof Object.prototype.valueOf.call(false), "object", 'typeof Object.prototype.valueOf.call(false)');