diff --git a/harness/$FAIL.js b/harness/$FAIL.js
deleted file mode 100644
index 64f13f14ed9891806bf2476cb2b3c941463fe677..0000000000000000000000000000000000000000
--- a/harness/$FAIL.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function $FAIL(message) {
-    testFailed(message);
-}
diff --git a/test/built-ins/Array/S15.4.3_A2.2.js b/test/built-ins/Array/S15.4.3_A2.2.js
index 28ea0c13c979a55eb509576a8bcbcc9ffebbf67d..643b9e0a53d7806fc165d567ca05525930e97233 100644
--- a/test/built-ins/Array/S15.4.3_A2.2.js
+++ b/test/built-ins/Array/S15.4.3_A2.2.js
@@ -5,12 +5,11 @@
 info: The length property of Array does not have the attribute DontDelete
 es5id: 15.4.3_A2.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.hasOwnProperty(\'length\') === true. Actual: ' + (Array.hasOwnProperty('length')));
+  $ERROR('#1: Array.hasOwnProperty(\'length\') === true. Actual: ' + (Array.hasOwnProperty('length')));
 }
 
 delete Array.length;
diff --git a/test/built-ins/Array/prototype/S15.4.3.1_A1.js b/test/built-ins/Array/prototype/S15.4.3.1_A1.js
index 448420536ad93e033c9db2cbe69b7798ac3a9c70..a870752a41c4125c4a2b096d7344a2251433e91e 100644
--- a/test/built-ins/Array/prototype/S15.4.3.1_A1.js
+++ b/test/built-ins/Array/prototype/S15.4.3.1_A1.js
@@ -5,10 +5,9 @@
 info: The Array has property prototype
 es5id: 15.4.3.1_A1
 description: Checking use hasOwnProperty
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.hasOwnProperty('prototype') !== true) {
-	$FAIL('#1: Array.hasOwnProperty(\'prototype\') === true. Actual: ' + (Array.hasOwnProperty('prototype')));
+	$ERROR('#1: Array.hasOwnProperty(\'prototype\') === true. Actual: ' + (Array.hasOwnProperty('prototype')));
 }
diff --git a/test/built-ins/Array/prototype/S15.4.3.1_A3.js b/test/built-ins/Array/prototype/S15.4.3.1_A3.js
index 420e31492e1feeed489f2e4c86c05b34ac07db43..5ae77516b0ec600c3a2f1d3b03a8266b140aedc5 100644
--- a/test/built-ins/Array/prototype/S15.4.3.1_A3.js
+++ b/test/built-ins/Array/prototype/S15.4.3.1_A3.js
@@ -5,12 +5,12 @@
 info: The Array.prototype property has the attribute DontDelete
 es5id: 15.4.3.1_A3
 description: Checking if deleting the Array.prototype property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (Array.hasOwnProperty('prototype') !== true) {
-	$FAIL('#1: Array.hasOwnProperty(\'prototype\') === true. Actual: ' + (Array.hasOwnProperty('prototype')));
+	$ERROR('#1: Array.hasOwnProperty(\'prototype\') === true. Actual: ' + (Array.hasOwnProperty('prototype')));
 }
 
 verifyNotConfigurable(Array, "prototype");
diff --git a/test/built-ins/Array/prototype/concat/S15.4.4.4_A4.2.js b/test/built-ins/Array/prototype/concat/S15.4.4.4_A4.2.js
index caf9da58f16da1160030562fbb5e65e49141308d..6ddfcd66d0387f9406763672e8159921cb0365c5 100644
--- a/test/built-ins/Array/prototype/concat/S15.4.4.4_A4.2.js
+++ b/test/built-ins/Array/prototype/concat/S15.4.4.4_A4.2.js
@@ -5,12 +5,11 @@
 info: The length property of concat does not have the attribute DontDelete
 es5id: 15.4.4.4_A4.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.concat.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.concat.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.concat.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.concat.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.concat.hasOwnProperty('length')));
 }
 
 delete Array.prototype.concat.length;
diff --git a/test/built-ins/Array/prototype/join/S15.4.4.5_A6.2.js b/test/built-ins/Array/prototype/join/S15.4.4.5_A6.2.js
index 8cc60f7f74cd3d711c27ded4b9909ba311459889..3c5cc0b9a810775a0b784b35417a6d145ddef985 100644
--- a/test/built-ins/Array/prototype/join/S15.4.4.5_A6.2.js
+++ b/test/built-ins/Array/prototype/join/S15.4.4.5_A6.2.js
@@ -5,12 +5,11 @@
 info: The length property of join does not have the attribute DontDelete
 es5id: 15.4.4.5_A6.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.join.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.join.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.join.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.join.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.join.hasOwnProperty('length')));
 }
 
 delete Array.prototype.join.length;
diff --git a/test/built-ins/Array/prototype/pop/S15.4.4.6_A5.2.js b/test/built-ins/Array/prototype/pop/S15.4.4.6_A5.2.js
index 21c1374617c35986f713f91cd7c788f8c78c3e61..b84b2a96afea0d415a5ee7b2ed81b4f3b186f5dd 100644
--- a/test/built-ins/Array/prototype/pop/S15.4.4.6_A5.2.js
+++ b/test/built-ins/Array/prototype/pop/S15.4.4.6_A5.2.js
@@ -5,12 +5,11 @@
 info: The length property of pop does not have the attribute DontDelete
 es5id: 15.4.4.6_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.pop.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.pop.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.pop.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.pop.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.pop.hasOwnProperty('length')));
 }
 
 delete Array.prototype.pop.length;
diff --git a/test/built-ins/Array/prototype/push/S15.4.4.7_A6.2.js b/test/built-ins/Array/prototype/push/S15.4.4.7_A6.2.js
index 4084d34a0e9b1f65c0f31c8ab36a61a72c0cc491..b7e5c85e36d6e861edad3c45ba1c1ff812d03fe1 100644
--- a/test/built-ins/Array/prototype/push/S15.4.4.7_A6.2.js
+++ b/test/built-ins/Array/prototype/push/S15.4.4.7_A6.2.js
@@ -5,12 +5,11 @@
 info: The length property of push does not have the attribute DontDelete
 es5id: 15.4.4.7_A6.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.push.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.push.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.push.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.push.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.push.hasOwnProperty('length')));
 }
 
 delete Array.prototype.push.length;
diff --git a/test/built-ins/Array/prototype/reverse/S15.4.4.8_A5.2.js b/test/built-ins/Array/prototype/reverse/S15.4.4.8_A5.2.js
index a80c86a5653e340443ae9d620693c88c742419ad..13cde2c9ce6f4532346ed7b5b3f31407c30ecce2 100644
--- a/test/built-ins/Array/prototype/reverse/S15.4.4.8_A5.2.js
+++ b/test/built-ins/Array/prototype/reverse/S15.4.4.8_A5.2.js
@@ -5,12 +5,11 @@
 info: The length property of reverse does not have the attribute DontDelete
 es5id: 15.4.4.8_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.reverse.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.reverse.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.reverse.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.reverse.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.reverse.hasOwnProperty('length')));
 }
 
 delete Array.prototype.reverse.length;
diff --git a/test/built-ins/Array/prototype/shift/S15.4.4.9_A5.2.js b/test/built-ins/Array/prototype/shift/S15.4.4.9_A5.2.js
index 1bd71a76f6b824eb9753fd70f445860e3ebc80e8..a9e197ce3e73dde1bd3c8c23b805b6da4b3d4867 100644
--- a/test/built-ins/Array/prototype/shift/S15.4.4.9_A5.2.js
+++ b/test/built-ins/Array/prototype/shift/S15.4.4.9_A5.2.js
@@ -5,12 +5,11 @@
 info: The length property of shift does not have the attribute DontDelete
 es5id: 15.4.4.9_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.shift.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.shift.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.shift.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.shift.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.shift.hasOwnProperty('length')));
 }
 
 delete Array.prototype.shift.length;
diff --git a/test/built-ins/Array/prototype/slice/S15.4.4.10_A3_T1.js b/test/built-ins/Array/prototype/slice/S15.4.4.10_A3_T1.js
index 85a35260763aaa7511ab76a8fb7ec8b90cda6c16..f9cb7eba399375551291f96247a4095221a015e8 100644
--- a/test/built-ins/Array/prototype/slice/S15.4.4.10_A3_T1.js
+++ b/test/built-ins/Array/prototype/slice/S15.4.4.10_A3_T1.js
@@ -5,7 +5,6 @@
 info: Check ToLength(length) for non Array objects
 es5id: 15.4.4.10_A3_T1
 description: length = 4294967296
-includes: [$FAIL.js]
 ---*/
 
 var obj = {};
@@ -16,7 +15,7 @@ obj.length = 4294967296;
 
 try {
   var arr = obj.slice(0,4294967296);
-  $FAIL('#1: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; var arr = obj.slice(0,4294967296); lead to throwing exception. Actual: '+arr);
+  $ERROR('#1: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; var arr = obj.slice(0,4294967296); lead to throwing exception. Actual: '+arr);
 } catch (e) {
   if (!(e instanceof RangeError)) {
     $ERROR('#1.1: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; var arr = obj.slice(0,4294967296); lead to throwing exception. Exception is instance of RangeError. Actual: exception is '+e);
diff --git a/test/built-ins/Array/prototype/slice/S15.4.4.10_A3_T2.js b/test/built-ins/Array/prototype/slice/S15.4.4.10_A3_T2.js
index 699318b1996e582f2b57a8aebb134fb0c6181eee..3ad9bdddd5fad6ec66c6bbb155eeb634ad3e26b4 100644
--- a/test/built-ins/Array/prototype/slice/S15.4.4.10_A3_T2.js
+++ b/test/built-ins/Array/prototype/slice/S15.4.4.10_A3_T2.js
@@ -5,7 +5,6 @@
 info: Check ToLength(length) for non Array objects
 es5id: 15.4.4.10_A3_T2
 description: length = 4294967297
-includes: [$FAIL.js]
 ---*/
 
 var obj = {};
@@ -16,7 +15,7 @@ obj.length = 4294967297;
 
 try {
   var arr = obj.slice(0,4294967297);
-  $FAIL('#1: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = "x"; obj[4294967296] = "y"; obj.length = 4294967297; var arr = obj.slice(0,4294967297); lead to throwing exception. Actual: '+arr);
+  $ERROR('#1: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = "x"; obj[4294967296] = "y"; obj.length = 4294967297; var arr = obj.slice(0,4294967297); lead to throwing exception. Actual: '+arr);
 } catch (e) {
   if (!(e instanceof RangeError)) {
     $ERROR('#1.1: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = "x"; obj[4294967296] = "y"; obj.length = 4294967297; var arr = obj.slice(0,4294967297); lead to throwing exception. Exception is instance of RangeError. Actual: exception is '+e);
diff --git a/test/built-ins/Array/prototype/slice/S15.4.4.10_A5.2.js b/test/built-ins/Array/prototype/slice/S15.4.4.10_A5.2.js
index e764b1a217c6740263b4de0688d22fbb28297fe1..24f1bafef27564eca8dbe246cb2a0b3c50bf5ca4 100644
--- a/test/built-ins/Array/prototype/slice/S15.4.4.10_A5.2.js
+++ b/test/built-ins/Array/prototype/slice/S15.4.4.10_A5.2.js
@@ -5,12 +5,11 @@
 info: The length property of slice does not have the attribute DontDelete
 es5id: 15.4.4.10_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.slice.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.slice.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.slice.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.slice.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.slice.hasOwnProperty('length')));
 }
 
 delete Array.prototype.slice.length;
diff --git a/test/built-ins/Array/prototype/sort/S15.4.4.11_A7.2.js b/test/built-ins/Array/prototype/sort/S15.4.4.11_A7.2.js
index bd006de0cc103a2557eaa24918aba93273601075..3501a3e0f961574b4cc0eacb9ce0bbe5a2c76009 100644
--- a/test/built-ins/Array/prototype/sort/S15.4.4.11_A7.2.js
+++ b/test/built-ins/Array/prototype/sort/S15.4.4.11_A7.2.js
@@ -5,12 +5,11 @@
 info: The length property of sort does not have the attribute DontDelete
 es5id: 15.4.4.11_A7.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.sort.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.sort.prototype.hasOwnProperty(\'length\') === true. Actual: ' + (Array.sort.prototype.hasOwnProperty('length')));
+  $ERROR('#1: Array.sort.prototype.hasOwnProperty(\'length\') === true. Actual: ' + (Array.sort.prototype.hasOwnProperty('length')));
 }
 
 delete Array.prototype.sort.length;
diff --git a/test/built-ins/Array/prototype/sort/S15.4.4.11_A8.js b/test/built-ins/Array/prototype/sort/S15.4.4.11_A8.js
index 73fa20f11b624ce53cf2de9fe6abcaea1351bb70..067cba536d70646f46b7175ba8be9eedf386da81 100644
--- a/test/built-ins/Array/prototype/sort/S15.4.4.11_A8.js
+++ b/test/built-ins/Array/prototype/sort/S15.4.4.11_A8.js
@@ -6,7 +6,6 @@ info: Call the comparefn passing undefined as the this value (step 13b)
 es5id: 15.4.4.11_A8
 description: comparefn tests that its this value is undefined
 flags: [onlyStrict]
-includes: [$FAIL.js]
 ---*/
 
 var global = this;
@@ -14,10 +13,10 @@ var global = this;
   "use strict";
 
   if (this === global) {
-    $FAIL('#1: Sort leaks global');
+    $ERROR('#1: Sort leaks global');
   }
   if (this !== undefined) {
-    $FAIL('#2: Sort comparefn should be called with this===undefined. ' +
+    $ERROR('#2: Sort comparefn should be called with this===undefined. ' +
           'Actual: ' + this);
   }
   return x - y;
diff --git a/test/built-ins/Array/prototype/splice/S15.4.4.12_A5.2.js b/test/built-ins/Array/prototype/splice/S15.4.4.12_A5.2.js
index 2fae02e1402d888ac86b6791784055e182ccfebb..741608e43284a4b2d73797376cc1d11dc4dfd451 100644
--- a/test/built-ins/Array/prototype/splice/S15.4.4.12_A5.2.js
+++ b/test/built-ins/Array/prototype/splice/S15.4.4.12_A5.2.js
@@ -5,12 +5,11 @@
 info: The length property of splice does not have the attribute DontDelete
 es5id: 15.4.4.12_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.splice.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.splice.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.splice.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.splice.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.splice.hasOwnProperty('length')));
 }
 
 delete Array.prototype.splice.length;
diff --git a/test/built-ins/Array/prototype/toLocaleString/S15.4.4.3_A4.2.js b/test/built-ins/Array/prototype/toLocaleString/S15.4.4.3_A4.2.js
index 9b001445b2a588c6ba390f1792cd10594efc767c..2bee11f30973973f9fb246874a45b4bf2ea95200 100644
--- a/test/built-ins/Array/prototype/toLocaleString/S15.4.4.3_A4.2.js
+++ b/test/built-ins/Array/prototype/toLocaleString/S15.4.4.3_A4.2.js
@@ -7,12 +7,11 @@ info: >
     DontDelete
 es5id: 15.4.4.3_A4.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.toLocaleString.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.toLocaleString.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.toLocaleString.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.toLocaleString.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.toLocaleString.hasOwnProperty('length')));
 }
 
 delete Array.prototype.toLocaleString.length;
diff --git a/test/built-ins/Array/prototype/toString/S15.4.4.2_A4.2.js b/test/built-ins/Array/prototype/toString/S15.4.4.2_A4.2.js
index f86a7757ff87ad5a62bb0f90a9dcd5540d74c9a7..8e99d4f6c120941c197e81a9d970c70bee9d6725 100644
--- a/test/built-ins/Array/prototype/toString/S15.4.4.2_A4.2.js
+++ b/test/built-ins/Array/prototype/toString/S15.4.4.2_A4.2.js
@@ -5,12 +5,11 @@
 info: The length property of toString does not have the attribute DontDelete
 es5id: 15.4.4.2_A4.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.toString.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.toString.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.toString.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.toString.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.toString.hasOwnProperty('length')));
 }
 
 delete Array.prototype.toString.length;
diff --git a/test/built-ins/Array/prototype/unshift/S15.4.4.13_A5.2.js b/test/built-ins/Array/prototype/unshift/S15.4.4.13_A5.2.js
index 9d4ed0c948531756979fbe2901910210e2d8255a..4d0dc180752adaf713a006db8c77347604fd6a95 100644
--- a/test/built-ins/Array/prototype/unshift/S15.4.4.13_A5.2.js
+++ b/test/built-ins/Array/prototype/unshift/S15.4.4.13_A5.2.js
@@ -5,12 +5,11 @@
 info: The length property of unshift does not have the attribute DontDelete
 es5id: 15.4.4.13_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (Array.prototype.unshift.hasOwnProperty('length') !== true) {
-  $FAIL('#1: Array.prototype.unshift.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.unshift.hasOwnProperty('length')));
+  $ERROR('#1: Array.prototype.unshift.hasOwnProperty(\'length\') === true. Actual: ' + (Array.prototype.unshift.hasOwnProperty('length')));
 }
 
 delete Array.prototype.unshift.length;
diff --git a/test/built-ins/Boolean/prototype/S15.6.3.1_A1.js b/test/built-ins/Boolean/prototype/S15.6.3.1_A1.js
index 9daeede972cea55bb632e9b8c18b5d53bbc3e211..f0858ab33c3d5d923b3797268e9020ec0ce20c57 100644
--- a/test/built-ins/Boolean/prototype/S15.6.3.1_A1.js
+++ b/test/built-ins/Boolean/prototype/S15.6.3.1_A1.js
@@ -7,7 +7,6 @@ info: >
     prototype object
 es5id: 15.6.3.1_A1
 description: Checking Boolean.prototype property
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
@@ -18,7 +17,7 @@ if (typeof Boolean.prototype !== "object") {
 //CHECK#2
 try {
   (Boolean.prototype != false);
-  $FAIL('#2: "(Boolean.prototype != false);" lead to throwing exception. Actual: '+(Boolean.prototype != false));
+  $ERROR('#2: "(Boolean.prototype != false);" lead to throwing exception. Actual: '+(Boolean.prototype != false));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#2.1: "(Boolean.prototype != false)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Boolean/prototype/S15.6.4_A1.js b/test/built-ins/Boolean/prototype/S15.6.4_A1.js
index 87f5ff017ec90511032abdbf8c6ac98a8c469a47..10abf744ed8e792b22dbd1f0bc94e3fb5b23da4b 100644
--- a/test/built-ins/Boolean/prototype/S15.6.4_A1.js
+++ b/test/built-ins/Boolean/prototype/S15.6.4_A1.js
@@ -7,7 +7,6 @@ info: >
     (its [[Class]] is "Object")
 es5id: 15.6.4_A1
 description: Checking type and value of Boolean.prototype
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
@@ -18,7 +17,7 @@ if (typeof Boolean.prototype !== "object") {
 //CHECK#2
 try {
   (Boolean.prototype != false);
-  $FAIL('#2: "(Boolean.prototype != false);" lead to throwing exception. Actual: '+(Boolean.prototype != false));
+  $ERROR('#2: "(Boolean.prototype != false);" lead to throwing exception. Actual: '+(Boolean.prototype != false));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#2.1: "(Boolean.prototype != false)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Boolean/prototype/toString/S15.6.4.2_A1_T1.js b/test/built-ins/Boolean/prototype/toString/S15.6.4.2_A1_T1.js
index ecf174bfd33c1e2581432cad72df3d9e32c4a3fe..c07ecbd6ea095b699c41e0c4caf9ee61c1298c0d 100644
--- a/test/built-ins/Boolean/prototype/toString/S15.6.4.2_A1_T1.js
+++ b/test/built-ins/Boolean/prototype/toString/S15.6.4.2_A1_T1.js
@@ -8,13 +8,12 @@ info: >
     "false" is returned
 es5id: 15.6.4.2_A1_T1
 description: no arguments
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   (Boolean.prototype.toString() !== "false");
-  $FAIL('#1: "(Boolean.prototype.toString() !== "false");" lead to throwing exception. Actual: '+(Boolean.prototype.toString() !== "false"));
+  $ERROR('#1: "(Boolean.prototype.toString() !== "false");" lead to throwing exception. Actual: '+(Boolean.prototype.toString() !== "false"));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "(Boolean.prototype.toString() !== "false")" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Boolean/prototype/toString/S15.6.4.2_A1_T2.js b/test/built-ins/Boolean/prototype/toString/S15.6.4.2_A1_T2.js
index 2fcc7e385503cefb8d27a60ec989949d73b4ccff..197723a1e95456514e8da4d1d829c5ea28ab1fde 100644
--- a/test/built-ins/Boolean/prototype/toString/S15.6.4.2_A1_T2.js
+++ b/test/built-ins/Boolean/prototype/toString/S15.6.4.2_A1_T2.js
@@ -8,13 +8,12 @@ info: >
     "false" is returned
 es5id: 15.6.4.2_A1_T2
 description: with some argument
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   (Boolean.prototype.toString(true) !== "false");
-  $FAIL('#1: "(Boolean.prototype.toString(true) !== "false");" lead to throwing exception. Actual: '+(Boolean.prototype.toString(true) !== "false"));
+  $ERROR('#1: "(Boolean.prototype.toString(true) !== "false");" lead to throwing exception. Actual: '+(Boolean.prototype.toString(true) !== "false"));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "(Boolean.prototype.toString(true) !== "false")" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Boolean/prototype/valueOf/S15.6.4.3_A1_T1.js b/test/built-ins/Boolean/prototype/valueOf/S15.6.4.3_A1_T1.js
index 6d75e1c21bc4801f618e5e89a9f3aca47e76dc03..65d1b21bb3b84652ca5d8c69ff797051d6d91d61 100644
--- a/test/built-ins/Boolean/prototype/valueOf/S15.6.4.3_A1_T1.js
+++ b/test/built-ins/Boolean/prototype/valueOf/S15.6.4.3_A1_T1.js
@@ -5,13 +5,12 @@
 info: Boolean.prototype.valueOf() returns this boolean value
 es5id: 15.6.4.3_A1_T1
 description: no arguments
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   (Boolean.prototype.valueOf() !== false);
-  $FAIL('#1: "(Boolean.prototype.valueOf() !== false);" lead to throwing exception. Actual: '+(Boolean.prototype.valueOf() !== false));
+  $ERROR('#1: "(Boolean.prototype.valueOf() !== false);" lead to throwing exception. Actual: '+(Boolean.prototype.valueOf() !== false));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "(Boolean.prototype.valueOf() !== false)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Boolean/prototype/valueOf/S15.6.4.3_A1_T2.js b/test/built-ins/Boolean/prototype/valueOf/S15.6.4.3_A1_T2.js
index 1e059bcafe64f7c99394d35a1a8561afeeab8d85..8d803efd65ca0724c3c1f0cdb493f3f4389f4e3f 100644
--- a/test/built-ins/Boolean/prototype/valueOf/S15.6.4.3_A1_T2.js
+++ b/test/built-ins/Boolean/prototype/valueOf/S15.6.4.3_A1_T2.js
@@ -5,13 +5,12 @@
 info: Boolean.prototype.valueOf() returns this boolean value
 es5id: 15.6.4.3_A1_T2
 description: calling with argument
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   (Boolean.prototype.valueOf(true) !== false);
-  $FAIL('#1: "(Boolean.prototype.valueOf(true) !== false);" lead to throwing exception. Actual: '+(Boolean.prototype.valueOf(true) !== false));
+  $ERROR('#1: "(Boolean.prototype.valueOf(true) !== false);" lead to throwing exception. Actual: '+(Boolean.prototype.valueOf(true) !== false));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "(Boolean.prototype.valueOf(true) !== false)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Date/S15.9.3.1_A1_T1.js b/test/built-ins/Date/S15.9.3.1_A1_T1.js
index fff070d5c983a98578a80060b2d45d53099c12fb..936bc41eef72cba616f0f89cdf38dca57f2be4b3 100644
--- a/test/built-ins/Date/S15.9.3.1_A1_T1.js
+++ b/test/built-ins/Date/S15.9.3.1_A1_T1.js
@@ -7,221 +7,220 @@ info: >
     a constructor: it initializes the newly created object
 es5id: 15.9.3.1_A1_T1
 description: 2 arguments, (year, month)
-includes: [$FAIL.js]
 ---*/
 
 if (typeof new Date(1899, 11) !== "object") {
-  $FAIL("#1.1: typeof new Date(1899, 11) should be 'object'");
+  $ERROR("#1.1: typeof new Date(1899, 11) should be 'object'");
 }
 
 if (new Date(1899, 11) === undefined) {
-  $FAIL("#1.2: new Date(1899, 11) should not be undefined");
+  $ERROR("#1.2: new Date(1899, 11) should not be undefined");
 }
 
 var x13 = new Date(1899, 11);
 if(typeof x13 !== "object"){
-  $FAIL("#1.3: typeof new Date(1899, 11) should be 'object'");
+  $ERROR("#1.3: typeof new Date(1899, 11) should be 'object'");
 }
 
 var x14 = new Date(1899, 11);
 if(x14 === undefined){
-  $FAIL("#1.4: new Date(1899, 11) should not be undefined");
+  $ERROR("#1.4: new Date(1899, 11) should not be undefined");
 }
 
 if (typeof new Date(1899, 12) !== "object") {
-  $FAIL("#2.1: typeof new Date(1899, 12) should be 'object'");
+  $ERROR("#2.1: typeof new Date(1899, 12) should be 'object'");
 }
 
 if (new Date(1899, 12) === undefined) {
-  $FAIL("#2.2: new Date(1899, 12) should not be undefined");
+  $ERROR("#2.2: new Date(1899, 12) should not be undefined");
 }
 
 var x23 = new Date(1899, 12);
 if(typeof x23 !== "object"){
-  $FAIL("#2.3: typeof new Date(1899, 12) should be 'object'");
+  $ERROR("#2.3: typeof new Date(1899, 12) should be 'object'");
 }
 
 var x24 = new Date(1899, 12);
 if(x24 === undefined){
-  $FAIL("#2.4: new Date(1899, 12) should not be undefined");
+  $ERROR("#2.4: new Date(1899, 12) should not be undefined");
 }
 
 if (typeof new Date(1900, 0) !== "object") {
-  $FAIL("#3.1: typeof new Date(1900, 0) should be 'object'");
+  $ERROR("#3.1: typeof new Date(1900, 0) should be 'object'");
 }
 
 if (new Date(1900, 0) === undefined) {
-  $FAIL("#3.2: new Date(1900, 0) should not be undefined");
+  $ERROR("#3.2: new Date(1900, 0) should not be undefined");
 }
 
 var x33 = new Date(1900, 0);
 if(typeof x33 !== "object"){
-  $FAIL("#3.3: typeof new Date(1900, 0) should be 'object'");
+  $ERROR("#3.3: typeof new Date(1900, 0) should be 'object'");
 }
 
 var x34 = new Date(1900, 0);
 if(x34 === undefined){
-  $FAIL("#3.4: new Date(1900, 0) should not be undefined");
+  $ERROR("#3.4: new Date(1900, 0) should not be undefined");
 }
 
 if (typeof new Date(1969, 11) !== "object") {
-  $FAIL("#4.1: typeof new Date(1969, 11) should be 'object'");
+  $ERROR("#4.1: typeof new Date(1969, 11) should be 'object'");
 }
 
 if (new Date(1969, 11) === undefined) {
-  $FAIL("#4.2: new Date(1969, 11) should not be undefined");
+  $ERROR("#4.2: new Date(1969, 11) should not be undefined");
 }
 
 var x43 = new Date(1969, 11);
 if(typeof x43 !== "object"){
-  $FAIL("#4.3: typeof new Date(1969, 11) should be 'object'");
+  $ERROR("#4.3: typeof new Date(1969, 11) should be 'object'");
 }
 
 var x44 = new Date(1969, 11);
 if(x44 === undefined){
-  $FAIL("#4.4: new Date(1969, 11) should not be undefined");
+  $ERROR("#4.4: new Date(1969, 11) should not be undefined");
 }
 
 if (typeof new Date(1969, 12) !== "object") {
-  $FAIL("#5.1: typeof new Date(1969, 12) should be 'object'");
+  $ERROR("#5.1: typeof new Date(1969, 12) should be 'object'");
 }
 
 if (new Date(1969, 12) === undefined) {
-  $FAIL("#5.2: new Date(1969, 12) should not be undefined");
+  $ERROR("#5.2: new Date(1969, 12) should not be undefined");
 }
 
 var x53 = new Date(1969, 12);
 if(typeof x53 !== "object"){
-  $FAIL("#5.3: typeof new Date(1969, 12) should be 'object'");
+  $ERROR("#5.3: typeof new Date(1969, 12) should be 'object'");
 }
 
 var x54 = new Date(1969, 12);
 if(x54 === undefined){
-  $FAIL("#5.4: new Date(1969, 12) should not be undefined");
+  $ERROR("#5.4: new Date(1969, 12) should not be undefined");
 }
 
 if (typeof new Date(1970, 0) !== "object") {
-  $FAIL("#6.1: typeof new Date(1970, 0) should be 'object'");
+  $ERROR("#6.1: typeof new Date(1970, 0) should be 'object'");
 }
 
 if (new Date(1970, 0) === undefined) {
-  $FAIL("#6.2: new Date(1970, 0) should not be undefined");
+  $ERROR("#6.2: new Date(1970, 0) should not be undefined");
 }
 
 var x63 = new Date(1970, 0);
 if(typeof x63 !== "object"){
-  $FAIL("#6.3: typeof new Date(1970, 0) should be 'object'");
+  $ERROR("#6.3: typeof new Date(1970, 0) should be 'object'");
 }
 
 var x64 = new Date(1970, 0);
 if(x64 === undefined){
-  $FAIL("#6.4: new Date(1970, 0) should not be undefined");
+  $ERROR("#6.4: new Date(1970, 0) should not be undefined");
 }
 
 if (typeof new Date(1999, 11) !== "object") {
-  $FAIL("#7.1: typeof new Date(1999, 11) should be 'object'");
+  $ERROR("#7.1: typeof new Date(1999, 11) should be 'object'");
 }
 
 if (new Date(1999, 11) === undefined) {
-  $FAIL("#7.2: new Date(1999, 11) should not be undefined");
+  $ERROR("#7.2: new Date(1999, 11) should not be undefined");
 }
 
 var x73 = new Date(1999, 11);
 if(typeof x73 !== "object"){
-  $FAIL("#7.3: typeof new Date(1999, 11) should be 'object'");
+  $ERROR("#7.3: typeof new Date(1999, 11) should be 'object'");
 }
 
 var x74 = new Date(1999, 11);
 if(x74 === undefined){
-  $FAIL("#7.4: new Date(1999, 11) should not be undefined");
+  $ERROR("#7.4: new Date(1999, 11) should not be undefined");
 }
 
 if (typeof new Date(1999, 12) !== "object") {
-  $FAIL("#8.1: typeof new Date(1999, 12) should be 'object'");
+  $ERROR("#8.1: typeof new Date(1999, 12) should be 'object'");
 }
 
 if (new Date(1999, 12) === undefined) {
-  $FAIL("#8.2: new Date(1999, 12) should not be undefined");
+  $ERROR("#8.2: new Date(1999, 12) should not be undefined");
 }
 
 var x83 = new Date(1999, 12);
 if(typeof x83 !== "object"){
-  $FAIL("#8.3: typeof new Date(1999, 12) should be 'object'");
+  $ERROR("#8.3: typeof new Date(1999, 12) should be 'object'");
 }
 
 var x84 = new Date(1999, 12);
 if(x84 === undefined){
-  $FAIL("#8.4: new Date(1999, 12) should not be undefined");
+  $ERROR("#8.4: new Date(1999, 12) should not be undefined");
 }
 
 if (typeof new Date(2000, 0) !== "object") {
-  $FAIL("#9.1: typeof new Date(2000, 0) should be 'object'");
+  $ERROR("#9.1: typeof new Date(2000, 0) should be 'object'");
 }
 
 if (new Date(2000, 0) === undefined) {
-  $FAIL("#9.2: new Date(2000, 0) should not be undefined");
+  $ERROR("#9.2: new Date(2000, 0) should not be undefined");
 }
 
 var x93 = new Date(2000, 0);
 if(typeof x93 !== "object"){
-  $FAIL("#9.3: typeof new Date(2000, 0) should be 'object'");
+  $ERROR("#9.3: typeof new Date(2000, 0) should be 'object'");
 }
 
 var x94 = new Date(2000, 0);
 if(x94 === undefined){
-  $FAIL("#9.4: new Date(2000, 0) should not be undefined");
+  $ERROR("#9.4: new Date(2000, 0) should not be undefined");
 }
 
 if (typeof new Date(2099, 11) !== "object") {
-  $FAIL("#10.1: typeof new Date(2099, 11) should be 'object'");
+  $ERROR("#10.1: typeof new Date(2099, 11) should be 'object'");
 }
 
 if (new Date(2099, 11) === undefined) {
-  $FAIL("#10.2: new Date(2099, 11) should not be undefined");
+  $ERROR("#10.2: new Date(2099, 11) should not be undefined");
 }
 
 var x103 = new Date(2099, 11);
 if(typeof x103 !== "object"){
-  $FAIL("#10.3: typeof new Date(2099, 11) should be 'object'");
+  $ERROR("#10.3: typeof new Date(2099, 11) should be 'object'");
 }
 
 var x104 = new Date(2099, 11);
 if(x104 === undefined){
-  $FAIL("#10.4: new Date(2099, 11) should not be undefined");
+  $ERROR("#10.4: new Date(2099, 11) should not be undefined");
 }
 
 if (typeof new Date(2099, 12) !== "object") {
-  $FAIL("#11.1: typeof new Date(2099, 12) should be 'object'");
+  $ERROR("#11.1: typeof new Date(2099, 12) should be 'object'");
 }
 
 if (new Date(2099, 12) === undefined) {
-  $FAIL("#11.2: new Date(2099, 12) should not be undefined");
+  $ERROR("#11.2: new Date(2099, 12) should not be undefined");
 }
 
 var x113 = new Date(2099, 12);
 if(typeof x113 !== "object"){
-  $FAIL("#11.3: typeof new Date(2099, 12) should be 'object'");
+  $ERROR("#11.3: typeof new Date(2099, 12) should be 'object'");
 }
 
 var x114 = new Date(2099, 12);
 if(x114 === undefined){
-  $FAIL("#11.4: new Date(2099, 12) should not be undefined");
+  $ERROR("#11.4: new Date(2099, 12) should not be undefined");
 }
 
 if (typeof new Date(2100, 0) !== "object") {
-  $FAIL("#12.1: typeof new Date(2100, 0) should be 'object'");
+  $ERROR("#12.1: typeof new Date(2100, 0) should be 'object'");
 }
 
 if (new Date(2100, 0) === undefined) {
-  $FAIL("#12.2: new Date(2100, 0) should not be undefined");
+  $ERROR("#12.2: new Date(2100, 0) should not be undefined");
 }
 
 var x123 = new Date(2100, 0);
 if(typeof x123 !== "object"){
-  $FAIL("#12.3: typeof new Date(2100, 0) should be 'object'");
+  $ERROR("#12.3: typeof new Date(2100, 0) should be 'object'");
 }
 
 var x124 = new Date(2100, 0);
 if(x124 === undefined){
-  $FAIL("#12.4: new Date(2100, 0) should not be undefined");
+  $ERROR("#12.4: new Date(2100, 0) should not be undefined");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A1_T2.js b/test/built-ins/Date/S15.9.3.1_A1_T2.js
index e9d485444bcf0c8915ca69833d1f7807e203ee03..2a480828bcbb32d8cbab6b8c857f1060377a4ac0 100644
--- a/test/built-ins/Date/S15.9.3.1_A1_T2.js
+++ b/test/built-ins/Date/S15.9.3.1_A1_T2.js
@@ -7,221 +7,220 @@ info: >
     a constructor: it initializes the newly created object
 es5id: 15.9.3.1_A1_T2
 description: 3 arguments, (year, month, date)
-includes: [$FAIL.js]
 ---*/
 
 if (typeof new Date(1899, 11, 31) !== "object") {
-  $FAIL("#1.1: typeof new Date(1899, 11, 31) should be 'object'");
+  $ERROR("#1.1: typeof new Date(1899, 11, 31) should be 'object'");
 }
 
 if (new Date(1899, 11, 31) === undefined) {
-  $FAIL("#1.2: new Date(1899, 11, 31) should not be undefined");
+  $ERROR("#1.2: new Date(1899, 11, 31) should not be undefined");
 }
 
 var x13 = new Date(1899, 11, 31);
 if(typeof x13 !== "object"){
-  $FAIL("#1.3: typeof new Date(1899, 11, 31) should be 'object'");
+  $ERROR("#1.3: typeof new Date(1899, 11, 31) should be 'object'");
 }
 
 var x14 = new Date(1899, 11, 31);
 if(x14 === undefined){
-  $FAIL("#1.4: new Date(1899, 11, 31) should not be undefined");
+  $ERROR("#1.4: new Date(1899, 11, 31) should not be undefined");
 }
 
 if (typeof new Date(1899, 12, 1) !== "object") {
-  $FAIL("#2.1: typeof new Date(1899, 12, 1) should be 'object'");
+  $ERROR("#2.1: typeof new Date(1899, 12, 1) should be 'object'");
 }
 
 if (new Date(1899, 12, 1) === undefined) {
-  $FAIL("#2.2: new Date(1899, 12, 1) should not be undefined");
+  $ERROR("#2.2: new Date(1899, 12, 1) should not be undefined");
 }
 
 var x23 = new Date(1899, 12, 1);
 if(typeof x23 !== "object"){
-  $FAIL("#2.3: typeof new Date(1899, 12, 1) should be 'object'");
+  $ERROR("#2.3: typeof new Date(1899, 12, 1) should be 'object'");
 }
 
 var x24 = new Date(1899, 12, 1);
 if(x24 === undefined){
-  $FAIL("#2.4: new Date(1899, 12, 1) should not be undefined");
+  $ERROR("#2.4: new Date(1899, 12, 1) should not be undefined");
 }
 
 if (typeof new Date(1900, 0, 1) !== "object") {
-  $FAIL("#3.1: typeof new Date(1900, 0, 1) should be 'object'");
+  $ERROR("#3.1: typeof new Date(1900, 0, 1) should be 'object'");
 }
 
 if (new Date(1900, 0, 1) === undefined) {
-  $FAIL("#3.2: new Date(1900, 0, 1) should not be undefined");
+  $ERROR("#3.2: new Date(1900, 0, 1) should not be undefined");
 }
 
 var x33 = new Date(1900, 0, 1);
 if(typeof x33 !== "object"){
-  $FAIL("#3.3: typeof new Date(1900, 0, 1) should be 'object'");
+  $ERROR("#3.3: typeof new Date(1900, 0, 1) should be 'object'");
 }
 
 var x34 = new Date(1900, 0, 1);
 if(x34 === undefined){
-  $FAIL("#3.4: new Date(1900, 0, 1) should not be undefined");
+  $ERROR("#3.4: new Date(1900, 0, 1) should not be undefined");
 }
 
 if (typeof new Date(1969, 11, 31) !== "object") {
-  $FAIL("#4.1: typeof new Date(1969, 11, 31) should be 'object'");
+  $ERROR("#4.1: typeof new Date(1969, 11, 31) should be 'object'");
 }
 
 if (new Date(1969, 11, 31) === undefined) {
-  $FAIL("#4.2: new Date(1969, 11, 31) should not be undefined");
+  $ERROR("#4.2: new Date(1969, 11, 31) should not be undefined");
 }
 
 var x43 = new Date(1969, 11, 31);
 if(typeof x43 !== "object"){
-  $FAIL("#4.3: typeof new Date(1969, 11, 31) should be 'object'");
+  $ERROR("#4.3: typeof new Date(1969, 11, 31) should be 'object'");
 }
 
 var x44 = new Date(1969, 11, 31);
 if(x44 === undefined){
-  $FAIL("#4.4: new Date(1969, 11, 31) should not be undefined");
+  $ERROR("#4.4: new Date(1969, 11, 31) should not be undefined");
 }
 
 if (typeof new Date(1969, 12, 1) !== "object") {
-  $FAIL("#5.1: typeof new Date(1969, 12, 1) should be 'object'");
+  $ERROR("#5.1: typeof new Date(1969, 12, 1) should be 'object'");
 }
 
 if (new Date(1969, 12, 1) === undefined) {
-  $FAIL("#5.2: new Date(1969, 12, 1) should not be undefined");
+  $ERROR("#5.2: new Date(1969, 12, 1) should not be undefined");
 }
 
 var x53 = new Date(1969, 12, 1);
 if(typeof x53 !== "object"){
-  $FAIL("#5.3: typeof new Date(1969, 12, 1) should be 'object'");
+  $ERROR("#5.3: typeof new Date(1969, 12, 1) should be 'object'");
 }
 
 var x54 = new Date(1969, 12, 1);
 if(x54 === undefined){
-  $FAIL("#5.4: new Date(1969, 12, 1) should not be undefined");
+  $ERROR("#5.4: new Date(1969, 12, 1) should not be undefined");
 }
 
 if (typeof new Date(1970, 0, 1) !== "object") {
-  $FAIL("#6.1: typeof new Date(1970, 0, 1) should be 'object'");
+  $ERROR("#6.1: typeof new Date(1970, 0, 1) should be 'object'");
 }
 
 if (new Date(1970, 0, 1) === undefined) {
-  $FAIL("#6.2: new Date(1970, 0, 1) should not be undefined");
+  $ERROR("#6.2: new Date(1970, 0, 1) should not be undefined");
 }
 
 var x63 = new Date(1970, 0, 1);
 if(typeof x63 !== "object"){
-  $FAIL("#6.3: typeof new Date(1970, 0, 1) should be 'object'");
+  $ERROR("#6.3: typeof new Date(1970, 0, 1) should be 'object'");
 }
 
 var x64 = new Date(1970, 0, 1);
 if(x64 === undefined){
-  $FAIL("#6.4: new Date(1970, 0, 1) should not be undefined");
+  $ERROR("#6.4: new Date(1970, 0, 1) should not be undefined");
 }
 
 if (typeof new Date(1999, 11, 31) !== "object") {
-  $FAIL("#7.1: typeof new Date(1999, 11, 31) should be 'object'");
+  $ERROR("#7.1: typeof new Date(1999, 11, 31) should be 'object'");
 }
 
 if (new Date(1999, 11, 31) === undefined) {
-  $FAIL("#7.2: new Date(1999, 11, 31) should not be undefined");
+  $ERROR("#7.2: new Date(1999, 11, 31) should not be undefined");
 }
 
 var x73 = new Date(1999, 11, 31);
 if(typeof x73 !== "object"){
-  $FAIL("#7.3: typeof new Date(1999, 11, 31) should be 'object'");
+  $ERROR("#7.3: typeof new Date(1999, 11, 31) should be 'object'");
 }
 
 var x74 = new Date(1999, 11, 31);
 if(x74 === undefined){
-  $FAIL("#7.4: new Date(1999, 11, 31) should not be undefined");
+  $ERROR("#7.4: new Date(1999, 11, 31) should not be undefined");
 }
 
 if (typeof new Date(1999, 12, 1) !== "object") {
-  $FAIL("#8.1: typeof new Date(1999, 12, 1) should be 'object'");
+  $ERROR("#8.1: typeof new Date(1999, 12, 1) should be 'object'");
 }
 
 if (new Date(1999, 12, 1) === undefined) {
-  $FAIL("#8.2: new Date(1999, 12, 1) should not be undefined");
+  $ERROR("#8.2: new Date(1999, 12, 1) should not be undefined");
 }
 
 var x83 = new Date(1999, 12, 1);
 if(typeof x83 !== "object"){
-  $FAIL("#8.3: typeof new Date(1999, 12, 1) should be 'object'");
+  $ERROR("#8.3: typeof new Date(1999, 12, 1) should be 'object'");
 }
 
 var x84 = new Date(1999, 12, 1);
 if(x84 === undefined){
-  $FAIL("#8.4: new Date(1999, 12, 1) should not be undefined");
+  $ERROR("#8.4: new Date(1999, 12, 1) should not be undefined");
 }
 
 if (typeof new Date(2000, 0, 1) !== "object") {
-  $FAIL("#9.1: typeof new Date(2000, 0, 1) should be 'object'");
+  $ERROR("#9.1: typeof new Date(2000, 0, 1) should be 'object'");
 }
 
 if (new Date(2000, 0, 1) === undefined) {
-  $FAIL("#9.2: new Date(2000, 0, 1) should not be undefined");
+  $ERROR("#9.2: new Date(2000, 0, 1) should not be undefined");
 }
 
 var x93 = new Date(2000, 0, 1);
 if(typeof x93 !== "object"){
-  $FAIL("#9.3: typeof new Date(2000, 0, 1) should be 'object'");
+  $ERROR("#9.3: typeof new Date(2000, 0, 1) should be 'object'");
 }
 
 var x94 = new Date(2000, 0, 1);
 if(x94 === undefined){
-  $FAIL("#9.4: new Date(2000, 0, 1) should not be undefined");
+  $ERROR("#9.4: new Date(2000, 0, 1) should not be undefined");
 }
 
 if (typeof new Date(2099, 11, 31) !== "object") {
-  $FAIL("#10.1: typeof new Date(2099, 11, 31) should be 'object'");
+  $ERROR("#10.1: typeof new Date(2099, 11, 31) should be 'object'");
 }
 
 if (new Date(2099, 11, 31) === undefined) {
-  $FAIL("#10.2: new Date(2099, 11, 31) should not be undefined");
+  $ERROR("#10.2: new Date(2099, 11, 31) should not be undefined");
 }
 
 var x103 = new Date(2099, 11, 31);
 if(typeof x103 !== "object"){
-  $FAIL("#10.3: typeof new Date(2099, 11, 31) should be 'object'");
+  $ERROR("#10.3: typeof new Date(2099, 11, 31) should be 'object'");
 }
 
 var x104 = new Date(2099, 11, 31);
 if(x104 === undefined){
-  $FAIL("#10.4: new Date(2099, 11, 31) should not be undefined");
+  $ERROR("#10.4: new Date(2099, 11, 31) should not be undefined");
 }
 
 if (typeof new Date(2099, 12, 1) !== "object") {
-  $FAIL("#11.1: typeof new Date(2099, 12, 1) should be 'object'");
+  $ERROR("#11.1: typeof new Date(2099, 12, 1) should be 'object'");
 }
 
 if (new Date(2099, 12, 1) === undefined) {
-  $FAIL("#11.2: new Date(2099, 12, 1) should not be undefined");
+  $ERROR("#11.2: new Date(2099, 12, 1) should not be undefined");
 }
 
 var x113 = new Date(2099, 12, 1);
 if(typeof x113 !== "object"){
-  $FAIL("#11.3: typeof new Date(2099, 12, 1) should be 'object'");
+  $ERROR("#11.3: typeof new Date(2099, 12, 1) should be 'object'");
 }
 
 var x114 = new Date(2099, 12, 1);
 if(x114 === undefined){
-  $FAIL("#11.4: new Date(2099, 12, 1) should not be undefined");
+  $ERROR("#11.4: new Date(2099, 12, 1) should not be undefined");
 }
 
 if (typeof new Date(2100, 0, 1) !== "object") {
-  $FAIL("#12.1: typeof new Date(2100, 0, 1) should be 'object'");
+  $ERROR("#12.1: typeof new Date(2100, 0, 1) should be 'object'");
 }
 
 if (new Date(2100, 0, 1) === undefined) {
-  $FAIL("#12.2: new Date(2100, 0, 1) should not be undefined");
+  $ERROR("#12.2: new Date(2100, 0, 1) should not be undefined");
 }
 
 var x123 = new Date(2100, 0, 1);
 if(typeof x123 !== "object"){
-  $FAIL("#12.3: typeof new Date(2100, 0, 1) should be 'object'");
+  $ERROR("#12.3: typeof new Date(2100, 0, 1) should be 'object'");
 }
 
 var x124 = new Date(2100, 0, 1);
 if(x124 === undefined){
-  $FAIL("#12.4: new Date(2100, 0, 1) should not be undefined");
+  $ERROR("#12.4: new Date(2100, 0, 1) should not be undefined");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A1_T3.js b/test/built-ins/Date/S15.9.3.1_A1_T3.js
index 79c9945f04e30a7ad15e6738243a84f0b2c1e30f..736f7a95e2d8c093e171b6367e9e3faff0e239e7 100644
--- a/test/built-ins/Date/S15.9.3.1_A1_T3.js
+++ b/test/built-ins/Date/S15.9.3.1_A1_T3.js
@@ -7,221 +7,220 @@ info: >
     a constructor: it initializes the newly created object
 es5id: 15.9.3.1_A1_T3
 description: 4 arguments, (year, month, date, hours)
-includes: [$FAIL.js]
 ---*/
 
 if (typeof new Date(1899, 11, 31, 23) !== "object") {
-  $FAIL("#1.1: typeof new Date(1899, 11, 31, 23) should be 'object'");
+  $ERROR("#1.1: typeof new Date(1899, 11, 31, 23) should be 'object'");
 }
 
 if (new Date(1899, 11, 31, 23) === undefined) {
-  $FAIL("#1.2: new Date(1899, 11, 31, 23) should not be undefined");
+  $ERROR("#1.2: new Date(1899, 11, 31, 23) should not be undefined");
 }
 
 var x13 = new Date(1899, 11, 31, 23);
 if(typeof x13 !== "object"){
-  $FAIL("#1.3: typeof new Date(1899, 11, 31, 23) should be 'object'");
+  $ERROR("#1.3: typeof new Date(1899, 11, 31, 23) should be 'object'");
 }
 
 var x14 = new Date(1899, 11, 31, 23);
 if(x14 === undefined){
-  $FAIL("#1.4: new Date(1899, 11, 31, 23) should not be undefined");
+  $ERROR("#1.4: new Date(1899, 11, 31, 23) should not be undefined");
 }
 
 if (typeof new Date(1899, 12, 1, 0) !== "object") {
-  $FAIL("#2.1: typeof new Date(1899, 12, 1, 0) should be 'object'");
+  $ERROR("#2.1: typeof new Date(1899, 12, 1, 0) should be 'object'");
 }
 
 if (new Date(1899, 12, 1, 0) === undefined) {
-  $FAIL("#2.2: new Date(1899, 12, 1, 0) should not be undefined");
+  $ERROR("#2.2: new Date(1899, 12, 1, 0) should not be undefined");
 }
 
 var x23 = new Date(1899, 12, 1, 0);
 if(typeof x23 !== "object"){
-  $FAIL("#2.3: typeof new Date(1899, 12, 1, 0) should be 'object'");
+  $ERROR("#2.3: typeof new Date(1899, 12, 1, 0) should be 'object'");
 }
 
 var x24 = new Date(1899, 12, 1, 0);
 if(x24 === undefined){
-  $FAIL("#2.4: new Date(1899, 12, 1, 0) should not be undefined");
+  $ERROR("#2.4: new Date(1899, 12, 1, 0) should not be undefined");
 }
 
 if (typeof new Date(1900, 0, 1, 0) !== "object") {
-  $FAIL("#3.1: typeof new Date(1900, 0, 1, 0) should be 'object'");
+  $ERROR("#3.1: typeof new Date(1900, 0, 1, 0) should be 'object'");
 }
 
 if (new Date(1900, 0, 1, 0) === undefined) {
-  $FAIL("#3.2: new Date(1900, 0, 1, 0) should not be undefined");
+  $ERROR("#3.2: new Date(1900, 0, 1, 0) should not be undefined");
 }
 
 var x33 = new Date(1900, 0, 1, 0);
 if(typeof x33 !== "object"){
-  $FAIL("#3.3: typeof new Date(1900, 0, 1, 0) should be 'object'");
+  $ERROR("#3.3: typeof new Date(1900, 0, 1, 0) should be 'object'");
 }
 
 var x34 = new Date(1900, 0, 1, 0);
 if(x34 === undefined){
-  $FAIL("#3.4: new Date(1900, 0, 1, 0) should not be undefined");
+  $ERROR("#3.4: new Date(1900, 0, 1, 0) should not be undefined");
 }
 
 if (typeof new Date(1969, 11, 31, 23) !== "object") {
-  $FAIL("#4.1: typeof new Date(1969, 11, 31, 23) should be 'object'");
+  $ERROR("#4.1: typeof new Date(1969, 11, 31, 23) should be 'object'");
 }
 
 if (new Date(1969, 11, 31, 23) === undefined) {
-  $FAIL("#4.2: new Date(1969, 11, 31, 23) should not be undefined");
+  $ERROR("#4.2: new Date(1969, 11, 31, 23) should not be undefined");
 }
 
 var x43 = new Date(1969, 11, 31, 23);
 if(typeof x43 !== "object"){
-  $FAIL("#4.3: typeof new Date(1969, 11, 31, 23) should be 'object'");
+  $ERROR("#4.3: typeof new Date(1969, 11, 31, 23) should be 'object'");
 }
 
 var x44 = new Date(1969, 11, 31, 23);
 if(x44 === undefined){
-  $FAIL("#4.4: new Date(1969, 11, 31, 23) should not be undefined");
+  $ERROR("#4.4: new Date(1969, 11, 31, 23) should not be undefined");
 }
 
 if (typeof new Date(1969, 12, 1, 0) !== "object") {
-  $FAIL("#5.1: typeof new Date(1969, 12, 1, 0) should be 'object'");
+  $ERROR("#5.1: typeof new Date(1969, 12, 1, 0) should be 'object'");
 }
 
 if (new Date(1969, 12, 1, 0) === undefined) {
-  $FAIL("#5.2: new Date(1969, 12, 1, 0) should not be undefined");
+  $ERROR("#5.2: new Date(1969, 12, 1, 0) should not be undefined");
 }
 
 var x53 = new Date(1969, 12, 1, 0);
 if(typeof x53 !== "object"){
-  $FAIL("#5.3: typeof new Date(1969, 12, 1, 0) should be 'object'");
+  $ERROR("#5.3: typeof new Date(1969, 12, 1, 0) should be 'object'");
 }
 
 var x54 = new Date(1969, 12, 1, 0);
 if(x54 === undefined){
-  $FAIL("#5.4: new Date(1969, 12, 1, 0) should not be undefined");
+  $ERROR("#5.4: new Date(1969, 12, 1, 0) should not be undefined");
 }
 
 if (typeof new Date(1970, 0, 1, 0) !== "object") {
-  $FAIL("#6.1: typeof new Date(1970, 0, 1, 0) should be 'object'");
+  $ERROR("#6.1: typeof new Date(1970, 0, 1, 0) should be 'object'");
 }
 
 if (new Date(1970, 0, 1, 0) === undefined) {
-  $FAIL("#6.2: new Date(1970, 0, 1, 0) should not be undefined");
+  $ERROR("#6.2: new Date(1970, 0, 1, 0) should not be undefined");
 }
 
 var x63 = new Date(1970, 0, 1, 0);
 if(typeof x63 !== "object"){
-  $FAIL("#6.3: typeof new Date(1970, 0, 1, 0) should be 'object'");
+  $ERROR("#6.3: typeof new Date(1970, 0, 1, 0) should be 'object'");
 }
 
 var x64 = new Date(1970, 0, 1, 0);
 if(x64 === undefined){
-  $FAIL("#6.4: new Date(1970, 0, 1, 0) should not be undefined");
+  $ERROR("#6.4: new Date(1970, 0, 1, 0) should not be undefined");
 }
 
 if (typeof new Date(1999, 11, 31, 23) !== "object") {
-  $FAIL("#7.1: typeof new Date(1999, 11, 31, 23) should be 'object'");
+  $ERROR("#7.1: typeof new Date(1999, 11, 31, 23) should be 'object'");
 }
 
 if (new Date(1999, 11, 31, 23) === undefined) {
-  $FAIL("#7.2: new Date(1999, 11, 31, 23) should not be undefined");
+  $ERROR("#7.2: new Date(1999, 11, 31, 23) should not be undefined");
 }
 
 var x73 = new Date(1999, 11, 31, 23);
 if(typeof x73 !== "object"){
-  $FAIL("#7.3: typeof new Date(1999, 11, 31, 23) should be 'object'");
+  $ERROR("#7.3: typeof new Date(1999, 11, 31, 23) should be 'object'");
 }
 
 var x74 = new Date(1999, 11, 31, 23);
 if(x74 === undefined){
-  $FAIL("#7.4: new Date(1999, 11, 31, 23) should not be undefined");
+  $ERROR("#7.4: new Date(1999, 11, 31, 23) should not be undefined");
 }
 
 if (typeof new Date(1999, 12, 1, 0) !== "object") {
-  $FAIL("#8.1: typeof new Date(1999, 12, 1, 0) should be 'object'");
+  $ERROR("#8.1: typeof new Date(1999, 12, 1, 0) should be 'object'");
 }
 
 if (new Date(1999, 12, 1, 0) === undefined) {
-  $FAIL("#8.2: new Date(1999, 12, 1, 0) should not be undefined");
+  $ERROR("#8.2: new Date(1999, 12, 1, 0) should not be undefined");
 }
 
 var x83 = new Date(1999, 12, 1, 0);
 if(typeof x83 !== "object"){
-  $FAIL("#8.3: typeof new Date(1999, 12, 1, 0) should be 'object'");
+  $ERROR("#8.3: typeof new Date(1999, 12, 1, 0) should be 'object'");
 }
 
 var x84 = new Date(1999, 12, 1, 0);
 if(x84 === undefined){
-  $FAIL("#8.4: new Date(1999, 12, 1, 0) should not be undefined");
+  $ERROR("#8.4: new Date(1999, 12, 1, 0) should not be undefined");
 }
 
 if (typeof new Date(2000, 0, 1, 0) !== "object") {
-  $FAIL("#9.1: typeof new Date(2000, 0, 1, 0) should be 'object'");
+  $ERROR("#9.1: typeof new Date(2000, 0, 1, 0) should be 'object'");
 }
 
 if (new Date(2000, 0, 1, 0) === undefined) {
-  $FAIL("#9.2: new Date(2000, 0, 1, 0) should not be undefined");
+  $ERROR("#9.2: new Date(2000, 0, 1, 0) should not be undefined");
 }
 
 var x93 = new Date(2000, 0, 1, 0);
 if(typeof x93 !== "object"){
-  $FAIL("#9.3: typeof new Date(2000, 0, 1, 0) should be 'object'");
+  $ERROR("#9.3: typeof new Date(2000, 0, 1, 0) should be 'object'");
 }
 
 var x94 = new Date(2000, 0, 1, 0);
 if(x94 === undefined){
-  $FAIL("#9.4: new Date(2000, 0, 1, 0) should not be undefined");
+  $ERROR("#9.4: new Date(2000, 0, 1, 0) should not be undefined");
 }
 
 if (typeof new Date(2099, 11, 31, 23) !== "object") {
-  $FAIL("#10.1: typeof new Date(2099, 11, 31, 23) should be 'object'");
+  $ERROR("#10.1: typeof new Date(2099, 11, 31, 23) should be 'object'");
 }
 
 if (new Date(2099, 11, 31, 23) === undefined) {
-  $FAIL("#10.2: new Date(2099, 11, 31, 23) should not be undefined");
+  $ERROR("#10.2: new Date(2099, 11, 31, 23) should not be undefined");
 }
 
 var x103 = new Date(2099, 11, 31, 23);
 if(typeof x103 !== "object"){
-  $FAIL("#10.3: typeof new Date(2099, 11, 31, 23) should be 'object'");
+  $ERROR("#10.3: typeof new Date(2099, 11, 31, 23) should be 'object'");
 }
 
 var x104 = new Date(2099, 11, 31, 23);
 if(x104 === undefined){
-  $FAIL("#10.4: new Date(2099, 11, 31, 23) should not be undefined");
+  $ERROR("#10.4: new Date(2099, 11, 31, 23) should not be undefined");
 }
 
 if (typeof new Date(2099, 12, 1, 0) !== "object") {
-  $FAIL("#11.1: typeof new Date(2099, 12, 1, 0) should be 'object'");
+  $ERROR("#11.1: typeof new Date(2099, 12, 1, 0) should be 'object'");
 }
 
 if (new Date(2099, 12, 1, 0) === undefined) {
-  $FAIL("#11.2: new Date(2099, 12, 1, 0) should not be undefined");
+  $ERROR("#11.2: new Date(2099, 12, 1, 0) should not be undefined");
 }
 
 var x113 = new Date(2099, 12, 1, 0);
 if(typeof x113 !== "object"){
-  $FAIL("#11.3: typeof new Date(2099, 12, 1, 0) should be 'object'");
+  $ERROR("#11.3: typeof new Date(2099, 12, 1, 0) should be 'object'");
 }
 
 var x114 = new Date(2099, 12, 1, 0);
 if(x114 === undefined){
-  $FAIL("#11.4: new Date(2099, 12, 1, 0) should not be undefined");
+  $ERROR("#11.4: new Date(2099, 12, 1, 0) should not be undefined");
 }
 
 if (typeof new Date(2100, 0, 1, 0) !== "object") {
-  $FAIL("#12.1: typeof new Date(2100, 0, 1, 0) should be 'object'");
+  $ERROR("#12.1: typeof new Date(2100, 0, 1, 0) should be 'object'");
 }
 
 if (new Date(2100, 0, 1, 0) === undefined) {
-  $FAIL("#12.2: new Date(2100, 0, 1, 0) should not be undefined");
+  $ERROR("#12.2: new Date(2100, 0, 1, 0) should not be undefined");
 }
 
 var x123 = new Date(2100, 0, 1, 0);
 if(typeof x123 !== "object"){
-  $FAIL("#12.3: typeof new Date(2100, 0, 1, 0) should be 'object'");
+  $ERROR("#12.3: typeof new Date(2100, 0, 1, 0) should be 'object'");
 }
 
 var x124 = new Date(2100, 0, 1, 0);
 if(x124 === undefined){
-  $FAIL("#12.4: new Date(2100, 0, 1, 0) should not be undefined");
+  $ERROR("#12.4: new Date(2100, 0, 1, 0) should not be undefined");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A1_T4.js b/test/built-ins/Date/S15.9.3.1_A1_T4.js
index 5bf11ca227c9ff3e8a1f8db61bd34eb0741cb1c0..fd21c47c364629c2f21dc3bfbded31852ad3500f 100644
--- a/test/built-ins/Date/S15.9.3.1_A1_T4.js
+++ b/test/built-ins/Date/S15.9.3.1_A1_T4.js
@@ -7,221 +7,220 @@ info: >
     a constructor: it initializes the newly created object
 es5id: 15.9.3.1_A1_T4
 description: 5 arguments, (year, month, date, hours, minutes)
-includes: [$FAIL.js]
 ---*/
 
 if (typeof new Date(1899, 11, 31, 23, 59) !== "object") {
-  $FAIL("#1.1: typeof new Date(1899, 11, 31, 23, 59) should be 'object'");
+  $ERROR("#1.1: typeof new Date(1899, 11, 31, 23, 59) should be 'object'");
 }
 
 if (new Date(1899, 11, 31, 23, 59) === undefined) {
-  $FAIL("#1.2: new Date(1899, 11, 31, 23, 59) should not be undefined");
+  $ERROR("#1.2: new Date(1899, 11, 31, 23, 59) should not be undefined");
 }
 
 var x13 = new Date(1899, 11, 31, 23, 59);
 if(typeof x13 !== "object"){
-  $FAIL("#1.3: typeof new Date(1899, 11, 31, 23, 59) should be 'object'");
+  $ERROR("#1.3: typeof new Date(1899, 11, 31, 23, 59) should be 'object'");
 }
 
 var x14 = new Date(1899, 11, 31, 23, 59);
 if(x14 === undefined){
-  $FAIL("#1.4: new Date(1899, 11, 31, 23, 59) should not be undefined");
+  $ERROR("#1.4: new Date(1899, 11, 31, 23, 59) should not be undefined");
 }
 
 if (typeof new Date(1899, 12, 1, 0, 0) !== "object") {
-  $FAIL("#2.1: typeof new Date(1899, 12, 1, 0, 0) should be 'object'");
+  $ERROR("#2.1: typeof new Date(1899, 12, 1, 0, 0) should be 'object'");
 }
 
 if (new Date(1899, 12, 1, 0, 0) === undefined) {
-  $FAIL("#2.2: new Date(1899, 12, 1, 0, 0) should not be undefined");
+  $ERROR("#2.2: new Date(1899, 12, 1, 0, 0) should not be undefined");
 }
 
 var x23 = new Date(1899, 12, 1, 0, 0);
 if(typeof x23 !== "object"){
-  $FAIL("#2.3: typeof new Date(1899, 12, 1, 0, 0) should be 'object'");
+  $ERROR("#2.3: typeof new Date(1899, 12, 1, 0, 0) should be 'object'");
 }
 
 var x24 = new Date(1899, 12, 1, 0, 0);
 if(x24 === undefined){
-  $FAIL("#2.4: new Date(1899, 12, 1, 0, 0) should not be undefined");
+  $ERROR("#2.4: new Date(1899, 12, 1, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1900, 0, 1, 0, 0) !== "object") {
-  $FAIL("#3.1: typeof new Date(1900, 0, 1, 0, 0) should be 'object'");
+  $ERROR("#3.1: typeof new Date(1900, 0, 1, 0, 0) should be 'object'");
 }
 
 if (new Date(1900, 0, 1, 0, 0) === undefined) {
-  $FAIL("#3.2: new Date(1900, 0, 1, 0, 0) should not be undefined");
+  $ERROR("#3.2: new Date(1900, 0, 1, 0, 0) should not be undefined");
 }
 
 var x33 = new Date(1900, 0, 1, 0, 0);
 if(typeof x33 !== "object"){
-  $FAIL("#3.3: typeof new Date(1900, 0, 1, 0, 0) should be 'object'");
+  $ERROR("#3.3: typeof new Date(1900, 0, 1, 0, 0) should be 'object'");
 }
 
 var x34 = new Date(1900, 0, 1, 0, 0);
 if(x34 === undefined){
-  $FAIL("#3.4: new Date(1900, 0, 1, 0, 0) should not be undefined");
+  $ERROR("#3.4: new Date(1900, 0, 1, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1969, 11, 31, 23, 59) !== "object") {
-  $FAIL("#4.1: typeof new Date(1969, 11, 31, 23, 59) should be 'object'");
+  $ERROR("#4.1: typeof new Date(1969, 11, 31, 23, 59) should be 'object'");
 }
 
 if (new Date(1969, 11, 31, 23, 59) === undefined) {
-  $FAIL("#4.2: new Date(1969, 11, 31, 23, 59) should not be undefined");
+  $ERROR("#4.2: new Date(1969, 11, 31, 23, 59) should not be undefined");
 }
 
 var x43 = new Date(1969, 11, 31, 23, 59);
 if(typeof x43 !== "object"){
-  $FAIL("#4.3: typeof new Date(1969, 11, 31, 23, 59) should be 'object'");
+  $ERROR("#4.3: typeof new Date(1969, 11, 31, 23, 59) should be 'object'");
 }
 
 var x44 = new Date(1969, 11, 31, 23, 59);
 if(x44 === undefined){
-  $FAIL("#4.4: new Date(1969, 11, 31, 23, 59) should not be undefined");
+  $ERROR("#4.4: new Date(1969, 11, 31, 23, 59) should not be undefined");
 }
 
 if (typeof new Date(1969, 12, 1, 0, 0) !== "object") {
-  $FAIL("#5.1: typeof new Date(1969, 12, 1, 0, 0) should be 'object'");
+  $ERROR("#5.1: typeof new Date(1969, 12, 1, 0, 0) should be 'object'");
 }
 
 if (new Date(1969, 12, 1, 0, 0) === undefined) {
-  $FAIL("#5.2: new Date(1969, 12, 1, 0, 0) should not be undefined");
+  $ERROR("#5.2: new Date(1969, 12, 1, 0, 0) should not be undefined");
 }
 
 var x53 = new Date(1969, 12, 1, 0, 0);
 if(typeof x53 !== "object"){
-  $FAIL("#5.3: typeof new Date(1969, 12, 1, 0, 0) should be 'object'");
+  $ERROR("#5.3: typeof new Date(1969, 12, 1, 0, 0) should be 'object'");
 }
 
 var x54 = new Date(1969, 12, 1, 0, 0);
 if(x54 === undefined){
-  $FAIL("#5.4: new Date(1969, 12, 1, 0, 0) should not be undefined");
+  $ERROR("#5.4: new Date(1969, 12, 1, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1970, 0, 1, 0, 0) !== "object") {
-  $FAIL("#6.1: typeof new Date(1970, 0, 1, 0, 0) should be 'object'");
+  $ERROR("#6.1: typeof new Date(1970, 0, 1, 0, 0) should be 'object'");
 }
 
 if (new Date(1970, 0, 1, 0, 0) === undefined) {
-  $FAIL("#6.2: new Date(1970, 0, 1, 0, 0) should not be undefined");
+  $ERROR("#6.2: new Date(1970, 0, 1, 0, 0) should not be undefined");
 }
 
 var x63 = new Date(1970, 0, 1, 0, 0);
 if(typeof x63 !== "object"){
-  $FAIL("#6.3: typeof new Date(1970, 0, 1, 0, 0) should be 'object'");
+  $ERROR("#6.3: typeof new Date(1970, 0, 1, 0, 0) should be 'object'");
 }
 
 var x64 = new Date(1970, 0, 1, 0, 0);
 if(x64 === undefined){
-  $FAIL("#6.4: new Date(1970, 0, 1, 0, 0) should not be undefined");
+  $ERROR("#6.4: new Date(1970, 0, 1, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1999, 11, 31, 23, 59) !== "object") {
-  $FAIL("#7.1: typeof new Date(1999, 11, 31, 23, 59) should be 'object'");
+  $ERROR("#7.1: typeof new Date(1999, 11, 31, 23, 59) should be 'object'");
 }
 
 if (new Date(1999, 11, 31, 23, 59) === undefined) {
-  $FAIL("#7.2: new Date(1999, 11, 31, 23, 59) should not be undefined");
+  $ERROR("#7.2: new Date(1999, 11, 31, 23, 59) should not be undefined");
 }
 
 var x73 = new Date(1999, 11, 31, 23, 59);
 if(typeof x73 !== "object"){
-  $FAIL("#7.3: typeof new Date(1999, 11, 31, 23, 59) should be 'object'");
+  $ERROR("#7.3: typeof new Date(1999, 11, 31, 23, 59) should be 'object'");
 }
 
 var x74 = new Date(1999, 11, 31, 23, 59);
 if(x74 === undefined){
-  $FAIL("#7.4: new Date(1999, 11, 31, 23, 59) should not be undefined");
+  $ERROR("#7.4: new Date(1999, 11, 31, 23, 59) should not be undefined");
 }
 
 if (typeof new Date(1999, 12, 1, 0, 0) !== "object") {
-  $FAIL("#8.1: typeof new Date(1999, 12, 1, 0, 0) should be 'object'");
+  $ERROR("#8.1: typeof new Date(1999, 12, 1, 0, 0) should be 'object'");
 }
 
 if (new Date(1999, 12, 1, 0, 0) === undefined) {
-  $FAIL("#8.2: new Date(1999, 12, 1, 0, 0) should not be undefined");
+  $ERROR("#8.2: new Date(1999, 12, 1, 0, 0) should not be undefined");
 }
 
 var x83 = new Date(1999, 12, 1, 0, 0);
 if(typeof x83 !== "object"){
-  $FAIL("#8.3: typeof new Date(1999, 12, 1, 0, 0) should be 'object'");
+  $ERROR("#8.3: typeof new Date(1999, 12, 1, 0, 0) should be 'object'");
 }
 
 var x84 = new Date(1999, 12, 1, 0, 0);
 if(x84 === undefined){
-  $FAIL("#8.4: new Date(1999, 12, 1, 0, 0) should not be undefined");
+  $ERROR("#8.4: new Date(1999, 12, 1, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(2000, 0, 1, 0, 0) !== "object") {
-  $FAIL("#9.1: typeof new Date(2000, 0, 1, 0, 0) should be 'object'");
+  $ERROR("#9.1: typeof new Date(2000, 0, 1, 0, 0) should be 'object'");
 }
 
 if (new Date(2000, 0, 1, 0, 0) === undefined) {
-  $FAIL("#9.2: new Date(2000, 0, 1, 0, 0) should not be undefined");
+  $ERROR("#9.2: new Date(2000, 0, 1, 0, 0) should not be undefined");
 }
 
 var x93 = new Date(2000, 0, 1, 0, 0);
 if(typeof x93 !== "object"){
-  $FAIL("#9.3: typeof new Date(2000, 0, 1, 0, 0) should be 'object'");
+  $ERROR("#9.3: typeof new Date(2000, 0, 1, 0, 0) should be 'object'");
 }
 
 var x94 = new Date(2000, 0, 1, 0, 0);
 if(x94 === undefined){
-  $FAIL("#9.4: new Date(2000, 0, 1, 0, 0) should not be undefined");
+  $ERROR("#9.4: new Date(2000, 0, 1, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(2099, 11, 31, 23, 59) !== "object") {
-  $FAIL("#10.1: typeof new Date(2099, 11, 31, 23, 59) should be 'object'");
+  $ERROR("#10.1: typeof new Date(2099, 11, 31, 23, 59) should be 'object'");
 }
 
 if (new Date(2099, 11, 31, 23, 59) === undefined) {
-  $FAIL("#10.2: new Date(2099, 11, 31, 23, 59) should not be undefined");
+  $ERROR("#10.2: new Date(2099, 11, 31, 23, 59) should not be undefined");
 }
 
 var x103 = new Date(2099, 11, 31, 23, 59);
 if(typeof x103 !== "object"){
-  $FAIL("#10.3: typeof new Date(2099, 11, 31, 23, 59) should be 'object'");
+  $ERROR("#10.3: typeof new Date(2099, 11, 31, 23, 59) should be 'object'");
 }
 
 var x104 = new Date(2099, 11, 31, 23, 59);
 if(x104 === undefined){
-  $FAIL("#10.4: new Date(2099, 11, 31, 23, 59) should not be undefined");
+  $ERROR("#10.4: new Date(2099, 11, 31, 23, 59) should not be undefined");
 }
 
 if (typeof new Date(2099, 12, 1, 0, 0) !== "object") {
-  $FAIL("#11.1: typeof new Date(2099, 12, 1, 0, 0) should be 'object'");
+  $ERROR("#11.1: typeof new Date(2099, 12, 1, 0, 0) should be 'object'");
 }
 
 if (new Date(2099, 12, 1, 0, 0) === undefined) {
-  $FAIL("#11.2: new Date(2099, 12, 1, 0, 0) should not be undefined");
+  $ERROR("#11.2: new Date(2099, 12, 1, 0, 0) should not be undefined");
 }
 
 var x113 = new Date(2099, 12, 1, 0, 0);
 if(typeof x113 !== "object"){
-  $FAIL("#11.3: typeof new Date(2099, 12, 1, 0, 0) should be 'object'");
+  $ERROR("#11.3: typeof new Date(2099, 12, 1, 0, 0) should be 'object'");
 }
 
 var x114 = new Date(2099, 12, 1, 0, 0);
 if(x114 === undefined){
-  $FAIL("#11.4: new Date(2099, 12, 1, 0, 0) should not be undefined");
+  $ERROR("#11.4: new Date(2099, 12, 1, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(2100, 0, 1, 0, 0) !== "object") {
-  $FAIL("#12.1: typeof new Date(2100, 0, 1, 0, 0) should be 'object'");
+  $ERROR("#12.1: typeof new Date(2100, 0, 1, 0, 0) should be 'object'");
 }
 
 if (new Date(2100, 0, 1, 0, 0) === undefined) {
-  $FAIL("#12.2: new Date(2100, 0, 1, 0, 0) should not be undefined");
+  $ERROR("#12.2: new Date(2100, 0, 1, 0, 0) should not be undefined");
 }
 
 var x123 = new Date(2100, 0, 1, 0, 0);
 if(typeof x123 !== "object"){
-  $FAIL("#12.3: typeof new Date(2100, 0, 1, 0, 0) should be 'object'");
+  $ERROR("#12.3: typeof new Date(2100, 0, 1, 0, 0) should be 'object'");
 }
 
 var x124 = new Date(2100, 0, 1, 0, 0);
 if(x124 === undefined){
-  $FAIL("#12.4: new Date(2100, 0, 1, 0, 0) should not be undefined");
+  $ERROR("#12.4: new Date(2100, 0, 1, 0, 0) should not be undefined");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A1_T5.js b/test/built-ins/Date/S15.9.3.1_A1_T5.js
index 477276b05b58eac5c7f8c67d772f1e7fd3a58101..3ddadd9d0c4acf3d477ef103938308f42fd4a650 100644
--- a/test/built-ins/Date/S15.9.3.1_A1_T5.js
+++ b/test/built-ins/Date/S15.9.3.1_A1_T5.js
@@ -7,221 +7,220 @@ info: >
     a constructor: it initializes the newly created object
 es5id: 15.9.3.1_A1_T5
 description: 6 arguments, (year, month, date, hours, minutes, seconds)
-includes: [$FAIL.js]
 ---*/
 
 if (typeof new Date(1899, 11, 31, 23, 59, 59) !== "object") {
-  $FAIL("#1.1: typeof new Date(1899, 11, 31, 23, 59, 59) should be 'object'");
+  $ERROR("#1.1: typeof new Date(1899, 11, 31, 23, 59, 59) should be 'object'");
 }
 
 if (new Date(1899, 11, 31, 23, 59, 59) === undefined) {
-  $FAIL("#1.2: new Date(1899, 11, 31, 23, 59, 59) should not be undefined");
+  $ERROR("#1.2: new Date(1899, 11, 31, 23, 59, 59) should not be undefined");
 }
 
 var x13 = new Date(1899, 11, 31, 23, 59, 59);
 if(typeof x13 !== "object"){
-  $FAIL("#1.3: typeof new Date(1899, 11, 31, 23, 59, 59) should be 'object'");
+  $ERROR("#1.3: typeof new Date(1899, 11, 31, 23, 59, 59) should be 'object'");
 }
 
 var x14 = new Date(1899, 11, 31, 23, 59, 59);
 if(x14 === undefined){
-  $FAIL("#1.4: new Date(1899, 11, 31, 23, 59, 59) should not be undefined");
+  $ERROR("#1.4: new Date(1899, 11, 31, 23, 59, 59) should not be undefined");
 }
 
 if (typeof new Date(1899, 12, 1, 0, 0, 0) !== "object") {
-  $FAIL("#2.1: typeof new Date(1899, 12, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#2.1: typeof new Date(1899, 12, 1, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1899, 12, 1, 0, 0, 0) === undefined) {
-  $FAIL("#2.2: new Date(1899, 12, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#2.2: new Date(1899, 12, 1, 0, 0, 0) should not be undefined");
 }
 
 var x23 = new Date(1899, 12, 1, 0, 0, 0);
 if(typeof x23 !== "object"){
-  $FAIL("#2.3: typeof new Date(1899, 12, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#2.3: typeof new Date(1899, 12, 1, 0, 0, 0) should be 'object'");
 }
 
 var x24 = new Date(1899, 12, 1, 0, 0, 0);
 if(x24 === undefined){
-  $FAIL("#2.4: new Date(1899, 12, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#2.4: new Date(1899, 12, 1, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1900, 0, 1, 0, 0, 0) !== "object") {
-  $FAIL("#3.1: typeof new Date(1900, 0, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#3.1: typeof new Date(1900, 0, 1, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1900, 0, 1, 0, 0, 0) === undefined) {
-  $FAIL("#3.2: new Date(1900, 0, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#3.2: new Date(1900, 0, 1, 0, 0, 0) should not be undefined");
 }
 
 var x33 = new Date(1900, 0, 1, 0, 0, 0);
 if(typeof x33 !== "object"){
-  $FAIL("#3.3: typeof new Date(1900, 0, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#3.3: typeof new Date(1900, 0, 1, 0, 0, 0) should be 'object'");
 }
 
 var x34 = new Date(1900, 0, 1, 0, 0, 0);
 if(x34 === undefined){
-  $FAIL("#3.4: new Date(1900, 0, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#3.4: new Date(1900, 0, 1, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1969, 11, 31, 23, 59, 59) !== "object") {
-  $FAIL("#4.1: typeof new Date(1969, 11, 31, 23, 59, 59) should be 'object'");
+  $ERROR("#4.1: typeof new Date(1969, 11, 31, 23, 59, 59) should be 'object'");
 }
 
 if (new Date(1969, 11, 31, 23, 59, 59) === undefined) {
-  $FAIL("#4.2: new Date(1969, 11, 31, 23, 59, 59) should not be undefined");
+  $ERROR("#4.2: new Date(1969, 11, 31, 23, 59, 59) should not be undefined");
 }
 
 var x43 = new Date(1969, 11, 31, 23, 59, 59);
 if(typeof x43 !== "object"){
-  $FAIL("#4.3: typeof new Date(1969, 11, 31, 23, 59, 59) should be 'object'");
+  $ERROR("#4.3: typeof new Date(1969, 11, 31, 23, 59, 59) should be 'object'");
 }
 
 var x44 = new Date(1969, 11, 31, 23, 59, 59);
 if(x44 === undefined){
-  $FAIL("#4.4: new Date(1969, 11, 31, 23, 59, 59) should not be undefined");
+  $ERROR("#4.4: new Date(1969, 11, 31, 23, 59, 59) should not be undefined");
 }
 
 if (typeof new Date(1969, 12, 1, 0, 0, 0) !== "object") {
-  $FAIL("#5.1: typeof new Date(1969, 12, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#5.1: typeof new Date(1969, 12, 1, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1969, 12, 1, 0, 0, 0) === undefined) {
-  $FAIL("#5.2: new Date(1969, 12, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#5.2: new Date(1969, 12, 1, 0, 0, 0) should not be undefined");
 }
 
 var x53 = new Date(1969, 12, 1, 0, 0, 0);
 if(typeof x53 !== "object"){
-  $FAIL("#5.3: typeof new Date(1969, 12, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#5.3: typeof new Date(1969, 12, 1, 0, 0, 0) should be 'object'");
 }
 
 var x54 = new Date(1969, 12, 1, 0, 0, 0);
 if(x54 === undefined){
-  $FAIL("#5.4: new Date(1969, 12, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#5.4: new Date(1969, 12, 1, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1970, 0, 1, 0, 0, 0) !== "object") {
-  $FAIL("#6.1: typeof new Date(1970, 0, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#6.1: typeof new Date(1970, 0, 1, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1970, 0, 1, 0, 0, 0) === undefined) {
-  $FAIL("#6.2: new Date(1970, 0, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#6.2: new Date(1970, 0, 1, 0, 0, 0) should not be undefined");
 }
 
 var x63 = new Date(1970, 0, 1, 0, 0, 0);
 if(typeof x63 !== "object"){
-  $FAIL("#6.3: typeof new Date(1970, 0, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#6.3: typeof new Date(1970, 0, 1, 0, 0, 0) should be 'object'");
 }
 
 var x64 = new Date(1970, 0, 1, 0, 0, 0);
 if(x64 === undefined){
-  $FAIL("#6.4: new Date(1970, 0, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#6.4: new Date(1970, 0, 1, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1999, 11, 31, 23, 59, 59) !== "object") {
-  $FAIL("#7.1: typeof new Date(1999, 11, 31, 23, 59, 59) should be 'object'");
+  $ERROR("#7.1: typeof new Date(1999, 11, 31, 23, 59, 59) should be 'object'");
 }
 
 if (new Date(1999, 11, 31, 23, 59, 59) === undefined) {
-  $FAIL("#7.2: new Date(1999, 11, 31, 23, 59, 59) should not be undefined");
+  $ERROR("#7.2: new Date(1999, 11, 31, 23, 59, 59) should not be undefined");
 }
 
 var x73 = new Date(1999, 11, 31, 23, 59, 59);
 if(typeof x73 !== "object"){
-  $FAIL("#7.3: typeof new Date(1999, 11, 31, 23, 59, 59) should be 'object'");
+  $ERROR("#7.3: typeof new Date(1999, 11, 31, 23, 59, 59) should be 'object'");
 }
 
 var x74 = new Date(1999, 11, 31, 23, 59, 59);
 if(x74 === undefined){
-  $FAIL("#7.4: new Date(1999, 11, 31, 23, 59, 59) should not be undefined");
+  $ERROR("#7.4: new Date(1999, 11, 31, 23, 59, 59) should not be undefined");
 }
 
 if (typeof new Date(1999, 12, 1, 0, 0, 0) !== "object") {
-  $FAIL("#8.1: typeof new Date(1999, 12, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#8.1: typeof new Date(1999, 12, 1, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1999, 12, 1, 0, 0, 0) === undefined) {
-  $FAIL("#8.2: new Date(1999, 12, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#8.2: new Date(1999, 12, 1, 0, 0, 0) should not be undefined");
 }
 
 var x83 = new Date(1999, 12, 1, 0, 0, 0);
 if(typeof x83 !== "object"){
-  $FAIL("#8.3: typeof new Date(1999, 12, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#8.3: typeof new Date(1999, 12, 1, 0, 0, 0) should be 'object'");
 }
 
 var x84 = new Date(1999, 12, 1, 0, 0, 0);
 if(x84 === undefined){
-  $FAIL("#8.4: new Date(1999, 12, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#8.4: new Date(1999, 12, 1, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(2000, 0, 1, 0, 0, 0) !== "object") {
-  $FAIL("#9.1: typeof new Date(2000, 0, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#9.1: typeof new Date(2000, 0, 1, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(2000, 0, 1, 0, 0, 0) === undefined) {
-  $FAIL("#9.2: new Date(2000, 0, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#9.2: new Date(2000, 0, 1, 0, 0, 0) should not be undefined");
 }
 
 var x93 = new Date(2000, 0, 1, 0, 0, 0);
 if(typeof x93 !== "object"){
-  $FAIL("#9.3: typeof new Date(2000, 0, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#9.3: typeof new Date(2000, 0, 1, 0, 0, 0) should be 'object'");
 }
 
 var x94 = new Date(2000, 0, 1, 0, 0, 0);
 if(x94 === undefined){
-  $FAIL("#9.4: new Date(2000, 0, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#9.4: new Date(2000, 0, 1, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(2099, 11, 31, 23, 59, 59) !== "object") {
-  $FAIL("#10.1: typeof new Date(2099, 11, 31, 23, 59, 59) should be 'object'");
+  $ERROR("#10.1: typeof new Date(2099, 11, 31, 23, 59, 59) should be 'object'");
 }
 
 if (new Date(2099, 11, 31, 23, 59, 59) === undefined) {
-  $FAIL("#10.2: new Date(2099, 11, 31, 23, 59, 59) should not be undefined");
+  $ERROR("#10.2: new Date(2099, 11, 31, 23, 59, 59) should not be undefined");
 }
 
 var x103 = new Date(2099, 11, 31, 23, 59, 59);
 if(typeof x103 !== "object"){
-  $FAIL("#10.3: typeof new Date(2099, 11, 31, 23, 59, 59) should be 'object'");
+  $ERROR("#10.3: typeof new Date(2099, 11, 31, 23, 59, 59) should be 'object'");
 }
 
 var x104 = new Date(2099, 11, 31, 23, 59, 59);
 if(x104 === undefined){
-  $FAIL("#10.4: new Date(2099, 11, 31, 23, 59, 59) should not be undefined");
+  $ERROR("#10.4: new Date(2099, 11, 31, 23, 59, 59) should not be undefined");
 }
 
 if (typeof new Date(2099, 12, 1, 0, 0, 0) !== "object") {
-  $FAIL("#11.1: typeof new Date(2099, 12, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#11.1: typeof new Date(2099, 12, 1, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(2099, 12, 1, 0, 0, 0) === undefined) {
-  $FAIL("#11.2: new Date(2099, 12, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#11.2: new Date(2099, 12, 1, 0, 0, 0) should not be undefined");
 }
 
 var x113 = new Date(2099, 12, 1, 0, 0, 0);
 if(typeof x113 !== "object"){
-  $FAIL("#11.3: typeof new Date(2099, 12, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#11.3: typeof new Date(2099, 12, 1, 0, 0, 0) should be 'object'");
 }
 
 var x114 = new Date(2099, 12, 1, 0, 0, 0);
 if(x114 === undefined){
-  $FAIL("#11.4: new Date(2099, 12, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#11.4: new Date(2099, 12, 1, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(2100, 0, 1, 0, 0, 0) !== "object") {
-  $FAIL("#12.1: typeof new Date(2100, 0, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#12.1: typeof new Date(2100, 0, 1, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(2100, 0, 1, 0, 0, 0) === undefined) {
-  $FAIL("#12.2: new Date(2100, 0, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#12.2: new Date(2100, 0, 1, 0, 0, 0) should not be undefined");
 }
 
 var x123 = new Date(2100, 0, 1, 0, 0, 0);
 if(typeof x123 !== "object"){
-  $FAIL("#12.3: typeof new Date(2100, 0, 1, 0, 0, 0) should be 'object'");
+  $ERROR("#12.3: typeof new Date(2100, 0, 1, 0, 0, 0) should be 'object'");
 }
 
 var x124 = new Date(2100, 0, 1, 0, 0, 0);
 if(x124 === undefined){
-  $FAIL("#12.4: new Date(2100, 0, 1, 0, 0, 0) should not be undefined");
+  $ERROR("#12.4: new Date(2100, 0, 1, 0, 0, 0) should not be undefined");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A1_T6.js b/test/built-ins/Date/S15.9.3.1_A1_T6.js
index bb9762ef980ffe816a2955b14be4265a8081473e..a815ce5608fc82d043529c8a8dc4573fdc70f592 100644
--- a/test/built-ins/Date/S15.9.3.1_A1_T6.js
+++ b/test/built-ins/Date/S15.9.3.1_A1_T6.js
@@ -7,221 +7,220 @@ info: >
     a constructor: it initializes the newly created object
 es5id: 15.9.3.1_A1_T6
 description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
-includes: [$FAIL.js]
 ---*/
 
 if (typeof new Date(1899, 11, 31, 23, 59, 59, 999) !== "object") {
-  $FAIL("#1.1: typeof new Date(1899, 11, 31, 23, 59, 59, 999) should be 'object'");
+  $ERROR("#1.1: typeof new Date(1899, 11, 31, 23, 59, 59, 999) should be 'object'");
 }
 
 if (new Date(1899, 11, 31, 23, 59, 59, 999) === undefined) {
-  $FAIL("#1.2: new Date(1899, 11, 31, 23, 59, 59, 999) should not be undefined");
+  $ERROR("#1.2: new Date(1899, 11, 31, 23, 59, 59, 999) should not be undefined");
 }
 
 var x13 = new Date(1899, 11, 31, 23, 59, 59, 999);
 if(typeof x13 !== "object"){
-  $FAIL("#1.3: typeof new Date(1899, 11, 31, 23, 59, 59, 999) should be 'object'");
+  $ERROR("#1.3: typeof new Date(1899, 11, 31, 23, 59, 59, 999) should be 'object'");
 }
 
 var x14 = new Date(1899, 11, 31, 23, 59, 59, 999);
 if(x14 === undefined){
-  $FAIL("#1.4: new Date(1899, 11, 31, 23, 59, 59, 999) should not be undefined");
+  $ERROR("#1.4: new Date(1899, 11, 31, 23, 59, 59, 999) should not be undefined");
 }
 
 if (typeof new Date(1899, 12, 1, 0, 0, 0, 0) !== "object") {
-  $FAIL("#2.1: typeof new Date(1899, 12, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#2.1: typeof new Date(1899, 12, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1899, 12, 1, 0, 0, 0, 0) === undefined) {
-  $FAIL("#2.2: new Date(1899, 12, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#2.2: new Date(1899, 12, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 var x23 = new Date(1899, 12, 1, 0, 0, 0, 0);
 if(typeof x23 !== "object"){
-  $FAIL("#2.3: typeof new Date(1899, 12, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#2.3: typeof new Date(1899, 12, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 var x24 = new Date(1899, 12, 1, 0, 0, 0, 0);
 if(x24 === undefined){
-  $FAIL("#2.4: new Date(1899, 12, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#2.4: new Date(1899, 12, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1900, 0, 1, 0, 0, 0, 0) !== "object") {
-  $FAIL("#3.1: typeof new Date(1900, 0, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#3.1: typeof new Date(1900, 0, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1900, 0, 1, 0, 0, 0, 0) === undefined) {
-  $FAIL("#3.2: new Date(1900, 0, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#3.2: new Date(1900, 0, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 var x33 = new Date(1900, 0, 1, 0, 0, 0, 0);
 if(typeof x33 !== "object"){
-  $FAIL("#3.3: typeof new Date(1900, 0, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#3.3: typeof new Date(1900, 0, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 var x34 = new Date(1900, 0, 1, 0, 0, 0, 0);
 if(x34 === undefined){
-  $FAIL("#3.4: new Date(1900, 0, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#3.4: new Date(1900, 0, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1969, 11, 31, 23, 59, 59, 999) !== "object") {
-  $FAIL("#4.1: typeof new Date(1969, 11, 31, 23, 59, 59, 999) should be 'object'");
+  $ERROR("#4.1: typeof new Date(1969, 11, 31, 23, 59, 59, 999) should be 'object'");
 }
 
 if (new Date(1969, 11, 31, 23, 59, 59, 999) === undefined) {
-  $FAIL("#4.2: new Date(1969, 11, 31, 23, 59, 59, 999) should not be undefined");
+  $ERROR("#4.2: new Date(1969, 11, 31, 23, 59, 59, 999) should not be undefined");
 }
 
 var x43 = new Date(1969, 11, 31, 23, 59, 59, 999);
 if(typeof x43 !== "object"){
-  $FAIL("#4.3: typeof new Date(1969, 11, 31, 23, 59, 59, 999) should be 'object'");
+  $ERROR("#4.3: typeof new Date(1969, 11, 31, 23, 59, 59, 999) should be 'object'");
 }
 
 var x44 = new Date(1969, 11, 31, 23, 59, 59, 999);
 if(x44 === undefined){
-  $FAIL("#4.4: new Date(1969, 11, 31, 23, 59, 59, 999) should not be undefined");
+  $ERROR("#4.4: new Date(1969, 11, 31, 23, 59, 59, 999) should not be undefined");
 }
 
 if (typeof new Date(1969, 12, 1, 0, 0, 0, 0) !== "object") {
-  $FAIL("#5.1: typeof new Date(1969, 12, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#5.1: typeof new Date(1969, 12, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1969, 12, 1, 0, 0, 0, 0) === undefined) {
-  $FAIL("#5.2: new Date(1969, 12, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#5.2: new Date(1969, 12, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 var x53 = new Date(1969, 12, 1, 0, 0, 0, 0);
 if(typeof x53 !== "object"){
-  $FAIL("#5.3: typeof new Date(1969, 12, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#5.3: typeof new Date(1969, 12, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 var x54 = new Date(1969, 12, 1, 0, 0, 0, 0);
 if(x54 === undefined){
-  $FAIL("#5.4: new Date(1969, 12, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#5.4: new Date(1969, 12, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1970, 0, 1, 0, 0, 0, 0) !== "object") {
-  $FAIL("#6.1: typeof new Date(1970, 0, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#6.1: typeof new Date(1970, 0, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1970, 0, 1, 0, 0, 0, 0) === undefined) {
-  $FAIL("#6.2: new Date(1970, 0, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#6.2: new Date(1970, 0, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 var x63 = new Date(1970, 0, 1, 0, 0, 0, 0);
 if(typeof x63 !== "object"){
-  $FAIL("#6.3: typeof new Date(1970, 0, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#6.3: typeof new Date(1970, 0, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 var x64 = new Date(1970, 0, 1, 0, 0, 0, 0);
 if(x64 === undefined){
-  $FAIL("#6.4: new Date(1970, 0, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#6.4: new Date(1970, 0, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(1999, 11, 31, 23, 59, 59, 999) !== "object") {
-  $FAIL("#7.1: typeof new Date(1999, 11, 31, 23, 59, 59, 999) should be 'object'");
+  $ERROR("#7.1: typeof new Date(1999, 11, 31, 23, 59, 59, 999) should be 'object'");
 }
 
 if (new Date(1999, 11, 31, 23, 59, 59, 999) === undefined) {
-  $FAIL("#7.2: new Date(1999, 11, 31, 23, 59, 59, 999) should not be undefined");
+  $ERROR("#7.2: new Date(1999, 11, 31, 23, 59, 59, 999) should not be undefined");
 }
 
 var x73 = new Date(1999, 11, 31, 23, 59, 59, 999);
 if(typeof x73 !== "object"){
-  $FAIL("#7.3: typeof new Date(1999, 11, 31, 23, 59, 59, 999) should be 'object'");
+  $ERROR("#7.3: typeof new Date(1999, 11, 31, 23, 59, 59, 999) should be 'object'");
 }
 
 var x74 = new Date(1999, 11, 31, 23, 59, 59, 999);
 if(x74 === undefined){
-  $FAIL("#7.4: new Date(1999, 11, 31, 23, 59, 59, 999) should not be undefined");
+  $ERROR("#7.4: new Date(1999, 11, 31, 23, 59, 59, 999) should not be undefined");
 }
 
 if (typeof new Date(1999, 12, 1, 0, 0, 0, 0) !== "object") {
-  $FAIL("#8.1: typeof new Date(1999, 12, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#8.1: typeof new Date(1999, 12, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(1999, 12, 1, 0, 0, 0, 0) === undefined) {
-  $FAIL("#8.2: new Date(1999, 12, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#8.2: new Date(1999, 12, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 var x83 = new Date(1999, 12, 1, 0, 0, 0, 0);
 if(typeof x83 !== "object"){
-  $FAIL("#8.3: typeof new Date(1999, 12, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#8.3: typeof new Date(1999, 12, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 var x84 = new Date(1999, 12, 1, 0, 0, 0, 0);
 if(x84 === undefined){
-  $FAIL("#8.4: new Date(1999, 12, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#8.4: new Date(1999, 12, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(2000, 0, 1, 0, 0, 0, 0) !== "object") {
-  $FAIL("#9.1: typeof new Date(2000, 0, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#9.1: typeof new Date(2000, 0, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(2000, 0, 1, 0, 0, 0, 0) === undefined) {
-  $FAIL("#9.2: new Date(2000, 0, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#9.2: new Date(2000, 0, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 var x93 = new Date(2000, 0, 1, 0, 0, 0, 0);
 if(typeof x93 !== "object"){
-  $FAIL("#9.3: typeof new Date(2000, 0, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#9.3: typeof new Date(2000, 0, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 var x94 = new Date(2000, 0, 1, 0, 0, 0, 0);
 if(x94 === undefined){
-  $FAIL("#9.4: new Date(2000, 0, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#9.4: new Date(2000, 0, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(2099, 11, 31, 23, 59, 59, 999) !== "object") {
-  $FAIL("#10.1: typeof new Date(2099, 11, 31, 23, 59, 59, 999) should be 'object'");
+  $ERROR("#10.1: typeof new Date(2099, 11, 31, 23, 59, 59, 999) should be 'object'");
 }
 
 if (new Date(2099, 11, 31, 23, 59, 59, 999) === undefined) {
-  $FAIL("#10.2: new Date(2099, 11, 31, 23, 59, 59, 999) should not be undefined");
+  $ERROR("#10.2: new Date(2099, 11, 31, 23, 59, 59, 999) should not be undefined");
 }
 
 var x103 = new Date(2099, 11, 31, 23, 59, 59, 999);
 if(typeof x103 !== "object"){
-  $FAIL("#10.3: typeof new Date(2099, 11, 31, 23, 59, 59, 999) should be 'object'");
+  $ERROR("#10.3: typeof new Date(2099, 11, 31, 23, 59, 59, 999) should be 'object'");
 }
 
 var x104 = new Date(2099, 11, 31, 23, 59, 59, 999);
 if(x104 === undefined){
-  $FAIL("#10.4: new Date(2099, 11, 31, 23, 59, 59, 999) should not be undefined");
+  $ERROR("#10.4: new Date(2099, 11, 31, 23, 59, 59, 999) should not be undefined");
 }
 
 if (typeof new Date(2099, 12, 1, 0, 0, 0, 0) !== "object") {
-  $FAIL("#11.1: typeof new Date(2099, 12, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#11.1: typeof new Date(2099, 12, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(2099, 12, 1, 0, 0, 0, 0) === undefined) {
-  $FAIL("#11.2: new Date(2099, 12, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#11.2: new Date(2099, 12, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 var x113 = new Date(2099, 12, 1, 0, 0, 0, 0);
 if(typeof x113 !== "object"){
-  $FAIL("#11.3: typeof new Date(2099, 12, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#11.3: typeof new Date(2099, 12, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 var x114 = new Date(2099, 12, 1, 0, 0, 0, 0);
 if(x114 === undefined){
-  $FAIL("#11.4: new Date(2099, 12, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#11.4: new Date(2099, 12, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 if (typeof new Date(2100, 0, 1, 0, 0, 0, 0) !== "object") {
-  $FAIL("#12.1: typeof new Date(2100, 0, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#12.1: typeof new Date(2100, 0, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 if (new Date(2100, 0, 1, 0, 0, 0, 0) === undefined) {
-  $FAIL("#12.2: new Date(2100, 0, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#12.2: new Date(2100, 0, 1, 0, 0, 0, 0) should not be undefined");
 }
 
 var x123 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if(typeof x123 !== "object"){
-  $FAIL("#12.3: typeof new Date(2100, 0, 1, 0, 0, 0, 0) should be 'object'");
+  $ERROR("#12.3: typeof new Date(2100, 0, 1, 0, 0, 0, 0) should be 'object'");
 }
 
 var x124 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if(x124 === undefined){
-  $FAIL("#12.4: new Date(2100, 0, 1, 0, 0, 0, 0) should not be undefined");
+  $ERROR("#12.4: new Date(2100, 0, 1, 0, 0, 0, 0) should not be undefined");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A2_T1.js b/test/built-ins/Date/S15.9.3.1_A2_T1.js
index cff4224567c8359370d53088995df978ede4cacd..7fa9f0062761639f72625b9fe94fb008125633c5 100644
--- a/test/built-ins/Date/S15.9.3.1_A2_T1.js
+++ b/test/built-ins/Date/S15.9.3.1_A2_T1.js
@@ -8,12 +8,11 @@ info: >
     initial value of Date.prototype
 es5id: 15.9.3.1_A2_T1
 description: 2 arguments, (year, month)
-includes: [$FAIL.js]
 ---*/
 
 var x11 = new Date(1899, 11);
 if (typeof x11.constructor.prototype !== "object") {
-  $FAIL("#1.1: typeof x11.constructor.prototype === 'object'");
+  $ERROR("#1.1: typeof x11.constructor.prototype === 'object'");
 }
 
 var x12 = new Date(1899, 11);
@@ -23,12 +22,12 @@ if (!Date.prototype.isPrototypeOf(x12)) {
 
 var x13 = new Date(1899, 11);
 if(Date.prototype !== x13.constructor.prototype){
-  $FAIL("#1.3: Date.prototype === x13.constructor.prototype");
+  $ERROR("#1.3: Date.prototype === x13.constructor.prototype");
 }
 
 var x21 = new Date(1899, 12);
 if (typeof x21.constructor.prototype !== "object") {
-  $FAIL("#2.1: typeof x11.constructor.prototype === 'object'");
+  $ERROR("#2.1: typeof x11.constructor.prototype === 'object'");
 }
 
 var x22 = new Date(1899, 12);
@@ -38,12 +37,12 @@ if (!Date.prototype.isPrototypeOf(x22)) {
 
 var x23 = new Date(1899, 12);
 if(Date.prototype !== x23.constructor.prototype){
-  $FAIL("#2.3: Date.prototype === x23.constructor.prototype");
+  $ERROR("#2.3: Date.prototype === x23.constructor.prototype");
 }
 
 var x31 = new Date(1900, 0);
 if (typeof x31.constructor.prototype !== "object") {
-  $FAIL("#3.1: typeof x31.constructor.prototype === 'object'");
+  $ERROR("#3.1: typeof x31.constructor.prototype === 'object'");
 }
 
 var x32 = new Date(1900, 0);
@@ -53,12 +52,12 @@ if (!Date.prototype.isPrototypeOf(x32)) {
 
 var x33 = new Date(1900, 0);
 if(Date.prototype !== x33.constructor.prototype){
-  $FAIL("#3.3: Date.prototype === x33.constructor.prototype");
+  $ERROR("#3.3: Date.prototype === x33.constructor.prototype");
 }
 
 var x41 = new Date(1969, 11);
 if (typeof x41.constructor.prototype !== "object") {
-  $FAIL("#4.1: typeof x41.constructor.prototype === 'object'");
+  $ERROR("#4.1: typeof x41.constructor.prototype === 'object'");
 }
 
 var x42 = new Date(1969, 11);
@@ -68,12 +67,12 @@ if (!Date.prototype.isPrototypeOf(x42)) {
 
 var x43 = new Date(1969, 11);
 if(Date.prototype !== x43.constructor.prototype){
-  $FAIL("#4.3: Date.prototype === x43.constructor.prototype");
+  $ERROR("#4.3: Date.prototype === x43.constructor.prototype");
 }
 
 var x51 = new Date(1969, 12);
 if (typeof x51.constructor.prototype !== "object") {
-  $FAIL("#5.1: typeof x51.constructor.prototype === 'object'");
+  $ERROR("#5.1: typeof x51.constructor.prototype === 'object'");
 }
 
 var x52 = new Date(1969, 12);
@@ -83,12 +82,12 @@ if (!Date.prototype.isPrototypeOf(x52)) {
 
 var x53 = new Date(1969, 12);
 if(Date.prototype !== x53.constructor.prototype){
-  $FAIL("#5.3: Date.prototype === x53.constructor.prototype");
+  $ERROR("#5.3: Date.prototype === x53.constructor.prototype");
 }
 
 var x61 = new Date(1970, 0);
 if (typeof x61.constructor.prototype !== "object") {
-  $FAIL("#6.1: typeof x61.constructor.prototype === 'object'");
+  $ERROR("#6.1: typeof x61.constructor.prototype === 'object'");
 }
 
 var x62 = new Date(1970, 0);
@@ -98,12 +97,12 @@ if (!Date.prototype.isPrototypeOf(x62)) {
 
 var x63 = new Date(1970, 0);
 if(Date.prototype !== x63.constructor.prototype){
-  $FAIL("#6.3: Date.prototype === x63.constructor.prototype");
+  $ERROR("#6.3: Date.prototype === x63.constructor.prototype");
 }
 
 var x71 = new Date(1999, 11);
 if (typeof x71.constructor.prototype !== "object") {
-  $FAIL("#7.1: typeof x71.constructor.prototype === 'object'");
+  $ERROR("#7.1: typeof x71.constructor.prototype === 'object'");
 }
 
 var x72 = new Date(1999, 11);
@@ -113,12 +112,12 @@ if (!Date.prototype.isPrototypeOf(x72)) {
 
 var x73 = new Date(1999, 11);
 if(Date.prototype !== x73.constructor.prototype){
-  $FAIL("#7.3: Date.prototype === x73.constructor.prototype");
+  $ERROR("#7.3: Date.prototype === x73.constructor.prototype");
 }
 
 var x81 = new Date(1999, 12);
 if (typeof x81.constructor.prototype !== "object") {
-  $FAIL("#8.1: typeof x81.constructor.prototype === 'object'");
+  $ERROR("#8.1: typeof x81.constructor.prototype === 'object'");
 }
 
 var x82 = new Date(1999, 12);
@@ -128,12 +127,12 @@ if (!Date.prototype.isPrototypeOf(x82)) {
 
 var x83 = new Date(1999, 12);
 if(Date.prototype !== x83.constructor.prototype){
-  $FAIL("#8.3: Date.prototype === x83.constructor.prototype");
+  $ERROR("#8.3: Date.prototype === x83.constructor.prototype");
 }
 
 var x91 = new Date(2000, 0);
 if (typeof x91.constructor.prototype !== "object") {
-  $FAIL("#9.1: typeof x91.constructor.prototype === 'object'");
+  $ERROR("#9.1: typeof x91.constructor.prototype === 'object'");
 }
 
 var x92 = new Date(2000, 0);
@@ -143,12 +142,12 @@ if (!Date.prototype.isPrototypeOf(x92)) {
 
 var x93 = new Date(2000, 0);
 if(Date.prototype !== x93.constructor.prototype){
-  $FAIL("#9.3: Date.prototype === x93.constructor.prototype");
+  $ERROR("#9.3: Date.prototype === x93.constructor.prototype");
 }
 
 var x101 = new Date(2099, 11);
 if (typeof x101.constructor.prototype !== "object") {
-  $FAIL("#10.1: typeof x101.constructor.prototype === 'object'");
+  $ERROR("#10.1: typeof x101.constructor.prototype === 'object'");
 }
 
 var x102 = new Date(2099, 11);
@@ -158,12 +157,12 @@ if (!Date.prototype.isPrototypeOf(x102)) {
 
 var x103 = new Date(2099, 11);
 if(Date.prototype !== x103.constructor.prototype){
-  $FAIL("#10.3: Date.prototype === x103.constructor.prototype");
+  $ERROR("#10.3: Date.prototype === x103.constructor.prototype");
 }
 
 var x111 = new Date(2099, 12);
 if (typeof x111.constructor.prototype !== "object") {
-  $FAIL("#11.1: typeof x111.constructor.prototype === 'object'");
+  $ERROR("#11.1: typeof x111.constructor.prototype === 'object'");
 }
 
 var x112 = new Date(2099, 12);
@@ -173,12 +172,12 @@ if (!Date.prototype.isPrototypeOf(x112)) {
 
 var x113 = new Date(2099, 12);
 if(Date.prototype !== x113.constructor.prototype){
-  $FAIL("#11.3: Date.prototype === x113.constructor.prototype");
+  $ERROR("#11.3: Date.prototype === x113.constructor.prototype");
 }
 
 var x121 = new Date(2100, 0);
 if (typeof x121.constructor.prototype !== "object") {
-  $FAIL("#12.1: typeof x121.constructor.prototype === 'object'");
+  $ERROR("#12.1: typeof x121.constructor.prototype === 'object'");
 }
 
 var x122 = new Date(2100, 0);
@@ -188,5 +187,5 @@ if (!Date.prototype.isPrototypeOf(x122)) {
 
 var x123 = new Date(2100, 0);
 if(Date.prototype !== x123.constructor.prototype){
-  $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
+  $ERROR("#12.3: Date.prototype === x123.constructor.prototype");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A2_T2.js b/test/built-ins/Date/S15.9.3.1_A2_T2.js
index e7788d52c24835324fd4ab97691356059711e05e..3088bc949842d891ab7705c94d73eb5c3e57ee29 100644
--- a/test/built-ins/Date/S15.9.3.1_A2_T2.js
+++ b/test/built-ins/Date/S15.9.3.1_A2_T2.js
@@ -8,12 +8,11 @@ info: >
     initial value of Date.prototype
 es5id: 15.9.3.1_A2_T2
 description: 3 arguments, (year, month, date)
-includes: [$FAIL.js]
 ---*/
 
 var x11 = new Date(1899, 11, 31);
 if (typeof x11.constructor.prototype !== "object") {
-  $FAIL("#1.1: typeof x11.constructor.prototype === 'object'");
+  $ERROR("#1.1: typeof x11.constructor.prototype === 'object'");
 }
 
 var x12 = new Date(1899, 11, 31);
@@ -23,12 +22,12 @@ if (!Date.prototype.isPrototypeOf(x12)) {
 
 var x13 = new Date(1899, 11, 31);
 if(Date.prototype !== x13.constructor.prototype){
-  $FAIL("#1.3: Date.prototype === x13.constructor.prototype");
+  $ERROR("#1.3: Date.prototype === x13.constructor.prototype");
 }
 
 var x21 = new Date(1899, 12, 1);
 if (typeof x21.constructor.prototype !== "object") {
-  $FAIL("#2.1: typeof x21.constructor.prototype === 'object'");
+  $ERROR("#2.1: typeof x21.constructor.prototype === 'object'");
 }
 
 var x22 = new Date(1899, 12, 1);
@@ -38,12 +37,12 @@ if (!Date.prototype.isPrototypeOf(x22)) {
 
 var x23 = new Date(1899, 12, 1);
 if(Date.prototype !== x23.constructor.prototype){
-  $FAIL("#2.3: Date.prototype === x23.constructor.prototype");
+  $ERROR("#2.3: Date.prototype === x23.constructor.prototype");
 }
 
 var x31 = new Date(1900, 0, 1);
 if (typeof x31.constructor.prototype !== "object") {
-  $FAIL("#3.1: typeof x31.constructor.prototype === 'object'");
+  $ERROR("#3.1: typeof x31.constructor.prototype === 'object'");
 }
 
 var x32 = new Date(1900, 0, 1);
@@ -53,12 +52,12 @@ if (!Date.prototype.isPrototypeOf(x32)) {
 
 var x33 = new Date(1900, 0, 1);
 if(Date.prototype !== x33.constructor.prototype){
-  $FAIL("#3.3: Date.prototype === x33.constructor.prototype");
+  $ERROR("#3.3: Date.prototype === x33.constructor.prototype");
 }
 
 var x41 = new Date(1969, 11, 31);
 if (typeof x41.constructor.prototype !== "object") {
-  $FAIL("#4.1: typeof x41.constructor.prototype === 'object'");
+  $ERROR("#4.1: typeof x41.constructor.prototype === 'object'");
 }
 
 var x42 = new Date(1969, 11, 31);
@@ -68,12 +67,12 @@ if (!Date.prototype.isPrototypeOf(x42)) {
 
 var x43 = new Date(1969, 11, 31);
 if(Date.prototype !== x43.constructor.prototype){
-  $FAIL("#4.3: Date.prototype === x43.constructor.prototype");
+  $ERROR("#4.3: Date.prototype === x43.constructor.prototype");
 }
 
 var x51 = new Date(1969, 12, 1);
 if (typeof x51.constructor.prototype !== "object") {
-  $FAIL("#5.1: typeof x51.constructor.prototype === 'object'");
+  $ERROR("#5.1: typeof x51.constructor.prototype === 'object'");
 }
 
 var x52 = new Date(1969, 12, 1);
@@ -83,12 +82,12 @@ if (!Date.prototype.isPrototypeOf(x52)) {
 
 var x53 = new Date(1969, 12, 1);
 if(Date.prototype !== x53.constructor.prototype){
-  $FAIL("#5.3: Date.prototype === x53.constructor.prototype");
+  $ERROR("#5.3: Date.prototype === x53.constructor.prototype");
 }
 
 var x61 = new Date(1970, 0, 1);
 if (typeof x61.constructor.prototype !== "object") {
-  $FAIL("#6.1: typeof x61.constructor.prototype === 'object'");
+  $ERROR("#6.1: typeof x61.constructor.prototype === 'object'");
 }
 
 var x62 = new Date(1970, 0, 1);
@@ -98,12 +97,12 @@ if (!Date.prototype.isPrototypeOf(x62)) {
 
 var x63 = new Date(1970, 0, 1);
 if(Date.prototype !== x63.constructor.prototype){
-  $FAIL("#6.3: Date.prototype === x63.constructor.prototype");
+  $ERROR("#6.3: Date.prototype === x63.constructor.prototype");
 }
 
 var x71 = new Date(1999, 11, 31);
 if (typeof x71.constructor.prototype !== "object") {
-  $FAIL("#7.1: typeof x71.constructor.prototype === 'object'");
+  $ERROR("#7.1: typeof x71.constructor.prototype === 'object'");
 }
 
 var x72 = new Date(1999, 11, 31);
@@ -113,12 +112,12 @@ if (!Date.prototype.isPrototypeOf(x72)) {
 
 var x73 = new Date(1999, 11, 31);
 if(Date.prototype !== x73.constructor.prototype){
-  $FAIL("#7.3: Date.prototype === x73.constructor.prototype");
+  $ERROR("#7.3: Date.prototype === x73.constructor.prototype");
 }
 
 var x81 = new Date(1999, 12, 1);
 if (typeof x81.constructor.prototype !== "object") {
-  $FAIL("#8.1: typeof x81.constructor.prototype === 'object'");
+  $ERROR("#8.1: typeof x81.constructor.prototype === 'object'");
 }
 
 var x82 = new Date(1999, 12, 1);
@@ -128,12 +127,12 @@ if (!Date.prototype.isPrototypeOf(x82)) {
 
 var x83 = new Date(1999, 12, 1);
 if(Date.prototype !== x83.constructor.prototype){
-  $FAIL("#8.3: Date.prototype === x83.constructor.prototype");
+  $ERROR("#8.3: Date.prototype === x83.constructor.prototype");
 }
 
 var x91 = new Date(2000, 0, 1);
 if (typeof x91.constructor.prototype !== "object") {
-  $FAIL("#9.1: typeof x91.constructor.prototype === 'object'");
+  $ERROR("#9.1: typeof x91.constructor.prototype === 'object'");
 }
 
 var x92 = new Date(2000, 0, 1);
@@ -143,12 +142,12 @@ if (!Date.prototype.isPrototypeOf(x92)) {
 
 var x93 = new Date(2000, 0, 1);
 if(Date.prototype !== x93.constructor.prototype){
-  $FAIL("#9.3: Date.prototype === x93.constructor.prototype");
+  $ERROR("#9.3: Date.prototype === x93.constructor.prototype");
 }
 
 var x101 = new Date(2099, 11, 31);
 if (typeof x101.constructor.prototype !== "object") {
-  $FAIL("#10.1: typeof x101.constructor.prototype === 'object'");
+  $ERROR("#10.1: typeof x101.constructor.prototype === 'object'");
 }
 
 var x102 = new Date(2099, 11, 31);
@@ -158,12 +157,12 @@ if (!Date.prototype.isPrototypeOf(x102)) {
 
 var x103 = new Date(2099, 11, 31);
 if(Date.prototype !== x103.constructor.prototype){
-  $FAIL("#10.3: Date.prototype === x103.constructor.prototype");
+  $ERROR("#10.3: Date.prototype === x103.constructor.prototype");
 }
 
 var x111 = new Date(2099, 12, 1);
 if (typeof x111.constructor.prototype !== "object") {
-  $FAIL("#11.1: typeof x111.constructor.prototype === 'object'");
+  $ERROR("#11.1: typeof x111.constructor.prototype === 'object'");
 }
 
 var x112 = new Date(2099, 12, 1);
@@ -173,12 +172,12 @@ if (!Date.prototype.isPrototypeOf(x112)) {
 
 var x113 = new Date(2099, 12, 1);
 if(Date.prototype !== x113.constructor.prototype){
-  $FAIL("#11.3: Date.prototype === x113.constructor.prototype");
+  $ERROR("#11.3: Date.prototype === x113.constructor.prototype");
 }
 
 var x121 = new Date(2100, 0, 1);
 if (typeof x121.constructor.prototype !== "object") {
-  $FAIL("#12.1: typeof x121.constructor.prototype === 'object'");
+  $ERROR("#12.1: typeof x121.constructor.prototype === 'object'");
 }
 
 var x122 = new Date(2100, 0, 1);
@@ -188,5 +187,5 @@ if (!Date.prototype.isPrototypeOf(x122)) {
 
 var x123 = new Date(2100, 0, 1);
 if(Date.prototype !== x123.constructor.prototype){
-  $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
+  $ERROR("#12.3: Date.prototype === x123.constructor.prototype");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A2_T3.js b/test/built-ins/Date/S15.9.3.1_A2_T3.js
index b713d8327ca76c2186c02f1e019838b9f070d8df..19fcb19baabc589ee6b328f632a4dfa32a117d22 100644
--- a/test/built-ins/Date/S15.9.3.1_A2_T3.js
+++ b/test/built-ins/Date/S15.9.3.1_A2_T3.js
@@ -8,12 +8,11 @@ info: >
     initial value of Date.prototype
 es5id: 15.9.3.1_A2_T3
 description: 4 arguments, (year, month, date, hours)
-includes: [$FAIL.js]
 ---*/
 
 var x11 = new Date(1899, 11, 31, 23);
 if (typeof x11.constructor.prototype !== "object") {
-  $FAIL("#1.1: typeof x11.constructor.prototype === 'object'");
+  $ERROR("#1.1: typeof x11.constructor.prototype === 'object'");
 }
 
 var x12 = new Date(1899, 11, 31, 23);
@@ -23,12 +22,12 @@ if (!Date.prototype.isPrototypeOf(x12)) {
 
 var x13 = new Date(1899, 11, 31, 23);
 if(Date.prototype !== x13.constructor.prototype){
-  $FAIL("#1.3: Date.prototype === x13.constructor.prototype");
+  $ERROR("#1.3: Date.prototype === x13.constructor.prototype");
 }
 
 var x21 = new Date(1899, 12, 1, 0);
 if (typeof x21.constructor.prototype !== "object") {
-  $FAIL("#2.1: typeof x21.constructor.prototype === 'object'");
+  $ERROR("#2.1: typeof x21.constructor.prototype === 'object'");
 }
 
 var x22 = new Date(1899, 12, 1, 0);
@@ -38,12 +37,12 @@ if (!Date.prototype.isPrototypeOf(x22)) {
 
 var x23 = new Date(1899, 12, 1, 0);
 if(Date.prototype !== x23.constructor.prototype){
-  $FAIL("#2.3: Date.prototype === x23.constructor.prototype");
+  $ERROR("#2.3: Date.prototype === x23.constructor.prototype");
 }
 
 var x31 = new Date(1900, 0, 1, 0);
 if (typeof x31.constructor.prototype !== "object") {
-  $FAIL("#3.1: typeof x31.constructor.prototype === 'object'");
+  $ERROR("#3.1: typeof x31.constructor.prototype === 'object'");
 }
 
 var x32 = new Date(1900, 0, 1, 0);
@@ -53,12 +52,12 @@ if (!Date.prototype.isPrototypeOf(x32)) {
 
 var x33 = new Date(1900, 0, 1, 0);
 if(Date.prototype !== x33.constructor.prototype){
-  $FAIL("#3.3: Date.prototype === x33.constructor.prototype");
+  $ERROR("#3.3: Date.prototype === x33.constructor.prototype");
 }
 
 var x41 = new Date(1969, 11, 31, 23);
 if (typeof x41.constructor.prototype !== "object") {
-  $FAIL("#4.1: typeof x41.constructor.prototype === 'object'");
+  $ERROR("#4.1: typeof x41.constructor.prototype === 'object'");
 }
 
 var x42 = new Date(1969, 11, 31, 23);
@@ -68,12 +67,12 @@ if (!Date.prototype.isPrototypeOf(x42)) {
 
 var x43 = new Date(1969, 11, 31, 23);
 if(Date.prototype !== x43.constructor.prototype){
-  $FAIL("#4.3: Date.prototype === x43.constructor.prototype");
+  $ERROR("#4.3: Date.prototype === x43.constructor.prototype");
 }
 
 var x51 = new Date(1969, 12, 1, 0);
 if (typeof x51.constructor.prototype !== "object") {
-  $FAIL("#5.1: typeof x51.constructor.prototype === 'object'");
+  $ERROR("#5.1: typeof x51.constructor.prototype === 'object'");
 }
 
 var x52 = new Date(1969, 12, 1, 0);
@@ -83,12 +82,12 @@ if (!Date.prototype.isPrototypeOf(x52)) {
 
 var x53 = new Date(1969, 12, 1, 0);
 if(Date.prototype !== x53.constructor.prototype){
-  $FAIL("#5.3: Date.prototype === x53.constructor.prototype");
+  $ERROR("#5.3: Date.prototype === x53.constructor.prototype");
 }
 
 var x61 = new Date(1970, 0, 1, 0);
 if (typeof x61.constructor.prototype !== "object") {
-  $FAIL("#6.1: typeof x61.constructor.prototype === 'object'");
+  $ERROR("#6.1: typeof x61.constructor.prototype === 'object'");
 }
 
 var x62 = new Date(1970, 0, 1, 0);
@@ -98,12 +97,12 @@ if (!Date.prototype.isPrototypeOf(x62)) {
 
 var x63 = new Date(1970, 0, 1, 0);
 if(Date.prototype !== x63.constructor.prototype){
-  $FAIL("#6.3: Date.prototype === x63.constructor.prototype");
+  $ERROR("#6.3: Date.prototype === x63.constructor.prototype");
 }
 
 var x71 = new Date(1999, 11, 31, 23);
 if (typeof x71.constructor.prototype !== "object") {
-  $FAIL("#7.1: typeof x71.constructor.prototype === 'object'");
+  $ERROR("#7.1: typeof x71.constructor.prototype === 'object'");
 }
 
 var x72 = new Date(1999, 11, 31, 23);
@@ -113,12 +112,12 @@ if (!Date.prototype.isPrototypeOf(x72)) {
 
 var x73 = new Date(1999, 11, 31, 23);
 if(Date.prototype !== x73.constructor.prototype){
-  $FAIL("#7.3: Date.prototype === x73.constructor.prototype");
+  $ERROR("#7.3: Date.prototype === x73.constructor.prototype");
 }
 
 var x81 = new Date(1999, 12, 1, 0);
 if (typeof x81.constructor.prototype !== "object") {
-  $FAIL("#8.1: typeof x81.constructor.prototype === 'object'");
+  $ERROR("#8.1: typeof x81.constructor.prototype === 'object'");
 }
 
 var x82 = new Date(1999, 12, 1, 0);
@@ -128,12 +127,12 @@ if (!Date.prototype.isPrototypeOf(x82)) {
 
 var x83 = new Date(1999, 12, 1, 0);
 if(Date.prototype !== x83.constructor.prototype){
-  $FAIL("#8.3: Date.prototype === x83.constructor.prototype");
+  $ERROR("#8.3: Date.prototype === x83.constructor.prototype");
 }
 
 var x91 = new Date(2000, 0, 1, 0);
 if (typeof x91.constructor.prototype !== "object") {
-  $FAIL("#9.1: typeof x91.constructor.prototype === 'object'");
+  $ERROR("#9.1: typeof x91.constructor.prototype === 'object'");
 }
 
 var x92 = new Date(2000, 0, 1, 0);
@@ -143,12 +142,12 @@ if (!Date.prototype.isPrototypeOf(x92)) {
 
 var x93 = new Date(2000, 0, 1, 0);
 if(Date.prototype !== x93.constructor.prototype){
-  $FAIL("#9.3: Date.prototype === x93.constructor.prototype");
+  $ERROR("#9.3: Date.prototype === x93.constructor.prototype");
 }
 
 var x101 = new Date(2099, 11, 31, 23);
 if (typeof x101.constructor.prototype !== "object") {
-  $FAIL("#10.1: typeof x101.constructor.prototype === 'object'");
+  $ERROR("#10.1: typeof x101.constructor.prototype === 'object'");
 }
 
 var x102 = new Date(2099, 11, 31, 23);
@@ -158,12 +157,12 @@ if (!Date.prototype.isPrototypeOf(x102)) {
 
 var x103 = new Date(2099, 11, 31, 23);
 if(Date.prototype !== x103.constructor.prototype){
-  $FAIL("#10.3: Date.prototype === x103.constructor.prototype");
+  $ERROR("#10.3: Date.prototype === x103.constructor.prototype");
 }
 
 var x111 = new Date(2099, 12, 1, 0);
 if (typeof x111.constructor.prototype !== "object") {
-  $FAIL("#11.1: typeof x111.constructor.prototype === 'object'");
+  $ERROR("#11.1: typeof x111.constructor.prototype === 'object'");
 }
 
 var x112 = new Date(2099, 12, 1, 0);
@@ -173,12 +172,12 @@ if (!Date.prototype.isPrototypeOf(x112)) {
 
 var x113 = new Date(2099, 12, 1, 0);
 if(Date.prototype !== x113.constructor.prototype){
-  $FAIL("#11.3: Date.prototype === x113.constructor.prototype");
+  $ERROR("#11.3: Date.prototype === x113.constructor.prototype");
 }
 
 var x121 = new Date(2100, 0, 1, 0);
 if (typeof x121.constructor.prototype !== "object") {
-  $FAIL("#12.1: typeof x121.constructor.prototype === 'object'");
+  $ERROR("#12.1: typeof x121.constructor.prototype === 'object'");
 }
 
 var x122 = new Date(2100, 0, 1, 0);
@@ -188,5 +187,5 @@ if (!Date.prototype.isPrototypeOf(x122)) {
 
 var x123 = new Date(2100, 0, 1, 0);
 if(Date.prototype !== x123.constructor.prototype){
-  $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
+  $ERROR("#12.3: Date.prototype === x123.constructor.prototype");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A2_T4.js b/test/built-ins/Date/S15.9.3.1_A2_T4.js
index 391537938ea5618a18d3f8ff0774cae3ded40295..d16d734592dd67ed038cc90e345b7d4d0e4d16eb 100644
--- a/test/built-ins/Date/S15.9.3.1_A2_T4.js
+++ b/test/built-ins/Date/S15.9.3.1_A2_T4.js
@@ -8,12 +8,11 @@ info: >
     initial value of Date.prototype
 es5id: 15.9.3.1_A2_T4
 description: 5 arguments, (year, month, date, hours, minutes)
-includes: [$FAIL.js]
 ---*/
 
 var x11 = new Date(1899, 11, 31, 23, 59);
 if (typeof x11.constructor.prototype !== "object") {
-  $FAIL("#1.1: typeof x11.constructor.prototype === 'object'");
+  $ERROR("#1.1: typeof x11.constructor.prototype === 'object'");
 }
 
 var x12 = new Date(1899, 11, 31, 23, 59);
@@ -23,12 +22,12 @@ if (!Date.prototype.isPrototypeOf(x12)) {
 
 var x13 = new Date(1899, 11, 31, 23, 59);
 if(Date.prototype !== x13.constructor.prototype){
-  $FAIL("#1.3: Date.prototype === x13.constructor.prototype");
+  $ERROR("#1.3: Date.prototype === x13.constructor.prototype");
 }
 
 var x21 = new Date(1899, 12, 1, 0, 0);
 if (typeof x21.constructor.prototype !== "object") {
-  $FAIL("#2.1: typeof x21.constructor.prototype === 'object'");
+  $ERROR("#2.1: typeof x21.constructor.prototype === 'object'");
 }
 
 var x22 = new Date(1899, 12, 1, 0, 0);
@@ -38,12 +37,12 @@ if (!Date.prototype.isPrototypeOf(x22)) {
 
 var x23 = new Date(1899, 12, 1, 0, 0);
 if(Date.prototype !== x23.constructor.prototype){
-  $FAIL("#2.3: Date.prototype === x23.constructor.prototype");
+  $ERROR("#2.3: Date.prototype === x23.constructor.prototype");
 }
 
 var x31 = new Date(1900, 0, 1, 0, 0);
 if (typeof x31.constructor.prototype !== "object") {
-  $FAIL("#3.1: typeof x31.constructor.prototype === 'object'");
+  $ERROR("#3.1: typeof x31.constructor.prototype === 'object'");
 }
 
 var x32 = new Date(1900, 0, 1, 0, 0);
@@ -53,12 +52,12 @@ if (!Date.prototype.isPrototypeOf(x32)) {
 
 var x33 = new Date(1900, 0, 1, 0, 0);
 if(Date.prototype !== x33.constructor.prototype){
-  $FAIL("#3.3: Date.prototype === x33.constructor.prototype");
+  $ERROR("#3.3: Date.prototype === x33.constructor.prototype");
 }
 
 var x41 = new Date(1969, 11, 31, 23, 59);
 if (typeof x41.constructor.prototype !== "object") {
-  $FAIL("#4.1: typeof x41.constructor.prototype === 'object'");
+  $ERROR("#4.1: typeof x41.constructor.prototype === 'object'");
 }
 
 var x42 = new Date(1969, 11, 31, 23, 59);
@@ -68,12 +67,12 @@ if (!Date.prototype.isPrototypeOf(x42)) {
 
 var x43 = new Date(1969, 11, 31, 23, 59);
 if(Date.prototype !== x43.constructor.prototype){
-  $FAIL("#4.3: Date.prototype === x43.constructor.prototype");
+  $ERROR("#4.3: Date.prototype === x43.constructor.prototype");
 }
 
 var x51 = new Date(1969, 12, 1, 0, 0);
 if (typeof x51.constructor.prototype !== "object") {
-  $FAIL("#5.1: typeof x51.constructor.prototype === 'object'");
+  $ERROR("#5.1: typeof x51.constructor.prototype === 'object'");
 }
 
 var x52 = new Date(1969, 12, 1, 0, 0);
@@ -83,12 +82,12 @@ if (!Date.prototype.isPrototypeOf(x52)) {
 
 var x53 = new Date(1969, 12, 1, 0, 0);
 if(Date.prototype !== x53.constructor.prototype){
-  $FAIL("#5.3: Date.prototype === x53.constructor.prototype");
+  $ERROR("#5.3: Date.prototype === x53.constructor.prototype");
 }
 
 var x61 = new Date(1970, 0, 1, 0, 0);
 if (typeof x61.constructor.prototype !== "object") {
-  $FAIL("#6.1: typeof x61.constructor.prototype === 'object'");
+  $ERROR("#6.1: typeof x61.constructor.prototype === 'object'");
 }
 
 var x62 = new Date(1970, 0, 1, 0, 0);
@@ -98,12 +97,12 @@ if (!Date.prototype.isPrototypeOf(x62)) {
 
 var x63 = new Date(1970, 0, 1, 0, 0);
 if(Date.prototype !== x63.constructor.prototype){
-  $FAIL("#6.3: Date.prototype === x63.constructor.prototype");
+  $ERROR("#6.3: Date.prototype === x63.constructor.prototype");
 }
 
 var x71 = new Date(1999, 11, 31, 23, 59);
 if (typeof x71.constructor.prototype !== "object") {
-  $FAIL("#7.1: typeof x71.constructor.prototype === 'object'");
+  $ERROR("#7.1: typeof x71.constructor.prototype === 'object'");
 }
 
 var x72 = new Date(1999, 11, 31, 23, 59);
@@ -113,12 +112,12 @@ if (!Date.prototype.isPrototypeOf(x72)) {
 
 var x73 = new Date(1999, 11, 31, 23, 59);
 if(Date.prototype !== x73.constructor.prototype){
-  $FAIL("#7.3: Date.prototype === x73.constructor.prototype");
+  $ERROR("#7.3: Date.prototype === x73.constructor.prototype");
 }
 
 var x81 = new Date(1999, 12, 1, 0, 0);
 if (typeof x81.constructor.prototype !== "object") {
-  $FAIL("#8.1: typeof x81.constructor.prototype === 'object'");
+  $ERROR("#8.1: typeof x81.constructor.prototype === 'object'");
 }
 
 var x82 = new Date(1999, 12, 1, 0, 0);
@@ -128,12 +127,12 @@ if (!Date.prototype.isPrototypeOf(x82)) {
 
 var x83 = new Date(1999, 12, 1, 0, 0);
 if(Date.prototype !== x83.constructor.prototype){
-  $FAIL("#8.3: Date.prototype === x83.constructor.prototype");
+  $ERROR("#8.3: Date.prototype === x83.constructor.prototype");
 }
 
 var x91 = new Date(2000, 0, 1, 0, 0);
 if (typeof x91.constructor.prototype !== "object") {
-  $FAIL("#9.1: typeof x91.constructor.prototype === 'object'");
+  $ERROR("#9.1: typeof x91.constructor.prototype === 'object'");
 }
 
 var x92 = new Date(2000, 0, 1, 0, 0);
@@ -143,12 +142,12 @@ if (!Date.prototype.isPrototypeOf(x92)) {
 
 var x93 = new Date(2000, 0, 1, 0, 0);
 if(Date.prototype !== x93.constructor.prototype){
-  $FAIL("#9.3: Date.prototype === x93.constructor.prototype");
+  $ERROR("#9.3: Date.prototype === x93.constructor.prototype");
 }
 
 var x101 = new Date(2099, 11, 31, 23, 59);
 if (typeof x101.constructor.prototype !== "object") {
-  $FAIL("#10.1: typeof x101.constructor.prototype === 'object'");
+  $ERROR("#10.1: typeof x101.constructor.prototype === 'object'");
 }
 
 var x102 = new Date(2099, 11, 31, 23, 59);
@@ -158,12 +157,12 @@ if (!Date.prototype.isPrototypeOf(x102)) {
 
 var x103 = new Date(2099, 11, 31, 23, 59);
 if(Date.prototype !== x103.constructor.prototype){
-  $FAIL("#10.3: Date.prototype === x103.constructor.prototype");
+  $ERROR("#10.3: Date.prototype === x103.constructor.prototype");
 }
 
 var x111 = new Date(2099, 12, 1, 0, 0);
 if (typeof x111.constructor.prototype !== "object") {
-  $FAIL("#11.1: typeof x111.constructor.prototype === 'object'");
+  $ERROR("#11.1: typeof x111.constructor.prototype === 'object'");
 }
 
 var x112 = new Date(2099, 12, 1, 0, 0);
@@ -173,12 +172,12 @@ if (!Date.prototype.isPrototypeOf(x112)) {
 
 var x113 = new Date(2099, 12, 1, 0, 0);
 if(Date.prototype !== x113.constructor.prototype){
-  $FAIL("#11.3: Date.prototype === x113.constructor.prototype");
+  $ERROR("#11.3: Date.prototype === x113.constructor.prototype");
 }
 
 var x121 = new Date(2100, 0, 1, 0, 0);
 if (typeof x121.constructor.prototype !== "object") {
-  $FAIL("#12.1: typeof x121.constructor.prototype === 'object'");
+  $ERROR("#12.1: typeof x121.constructor.prototype === 'object'");
 }
 
 var x122 = new Date(2100, 0, 1, 0, 0);
@@ -188,5 +187,5 @@ if (!Date.prototype.isPrototypeOf(x122)) {
 
 var x123 = new Date(2100, 0, 1, 0, 0);
 if(Date.prototype !== x123.constructor.prototype){
-  $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
+  $ERROR("#12.3: Date.prototype === x123.constructor.prototype");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A2_T5.js b/test/built-ins/Date/S15.9.3.1_A2_T5.js
index c938351a672031e68e6671a76eb0ca6c80b2338d..4780b9e62b8176f6bb331b62d9cc321d0dd9fb80 100644
--- a/test/built-ins/Date/S15.9.3.1_A2_T5.js
+++ b/test/built-ins/Date/S15.9.3.1_A2_T5.js
@@ -8,12 +8,11 @@ info: >
     initial value of Date.prototype
 es5id: 15.9.3.1_A2_T5
 description: 6 arguments, (year, month, date, hours, minutes, seconds)
-includes: [$FAIL.js]
 ---*/
 
 var x11 = new Date(1899, 11, 31, 23, 59, 59);
 if (typeof x11.constructor.prototype !== "object") {
-  $FAIL("#1.1: typeof x11.constructor.prototype === 'object'");
+  $ERROR("#1.1: typeof x11.constructor.prototype === 'object'");
 }
 
 var x12 = new Date(1899, 11, 31, 23, 59, 59);
@@ -23,12 +22,12 @@ if (!Date.prototype.isPrototypeOf(x12)) {
 
 var x13 = new Date(1899, 11, 31, 23, 59, 59);
 if(Date.prototype !== x13.constructor.prototype){
-  $FAIL("#1.3: Date.prototype === x13.constructor.prototype");
+  $ERROR("#1.3: Date.prototype === x13.constructor.prototype");
 }
 
 var x21 = new Date(1899, 12, 1, 0, 0, 0);
 if (typeof x21.constructor.prototype !== "object") {
-  $FAIL("#2.1: typeof x21.constructor.prototype === 'object'");
+  $ERROR("#2.1: typeof x21.constructor.prototype === 'object'");
 }
 
 var x22 = new Date(1899, 12, 1, 0, 0, 0);
@@ -38,12 +37,12 @@ if (!Date.prototype.isPrototypeOf(x22)) {
 
 var x23 = new Date(1899, 12, 1, 0, 0, 0);
 if(Date.prototype !== x23.constructor.prototype){
-  $FAIL("#2.3: Date.prototype === x23.constructor.prototype");
+  $ERROR("#2.3: Date.prototype === x23.constructor.prototype");
 }
 
 var x31 = new Date(1900, 0, 1, 0, 0, 0);
 if (typeof x31.constructor.prototype !== "object") {
-  $FAIL("#3.1: typeof x31.constructor.prototype === 'object'");
+  $ERROR("#3.1: typeof x31.constructor.prototype === 'object'");
 }
 
 var x32 = new Date(1900, 0, 1, 0, 0, 0);
@@ -53,12 +52,12 @@ if (!Date.prototype.isPrototypeOf(x32)) {
 
 var x33 = new Date(1900, 0, 1, 0, 0, 0);
 if(Date.prototype !== x33.constructor.prototype){
-  $FAIL("#3.3: Date.prototype === x33.constructor.prototype");
+  $ERROR("#3.3: Date.prototype === x33.constructor.prototype");
 }
 
 var x41 = new Date(1969, 11, 31, 23, 59, 59);
 if (typeof x41.constructor.prototype !== "object") {
-  $FAIL("#4.1: typeof x41.constructor.prototype === 'object'");
+  $ERROR("#4.1: typeof x41.constructor.prototype === 'object'");
 }
 
 var x42 = new Date(1969, 11, 31, 23, 59, 59);
@@ -68,12 +67,12 @@ if (!Date.prototype.isPrototypeOf(x42)) {
 
 var x43 = new Date(1969, 11, 31, 23, 59, 59);
 if(Date.prototype !== x43.constructor.prototype){
-  $FAIL("#4.3: Date.prototype === x43.constructor.prototype");
+  $ERROR("#4.3: Date.prototype === x43.constructor.prototype");
 }
 
 var x51 = new Date(1969, 12, 1, 0, 0, 0);
 if (typeof x51.constructor.prototype !== "object") {
-  $FAIL("#5.1: typeof x51.constructor.prototype === 'object'");
+  $ERROR("#5.1: typeof x51.constructor.prototype === 'object'");
 }
 
 var x52 = new Date(1969, 12, 1, 0, 0, 0);
@@ -83,12 +82,12 @@ if (!Date.prototype.isPrototypeOf(x52)) {
 
 var x53 = new Date(1969, 12, 1, 0, 0, 0);
 if(Date.prototype !== x53.constructor.prototype){
-  $FAIL("#5.3: Date.prototype === x53.constructor.prototype");
+  $ERROR("#5.3: Date.prototype === x53.constructor.prototype");
 }
 
 var x61 = new Date(1970, 0, 1, 0, 0, 0);
 if (typeof x61.constructor.prototype !== "object") {
-  $FAIL("#6.1: typeof x61.constructor.prototype === 'object'");
+  $ERROR("#6.1: typeof x61.constructor.prototype === 'object'");
 }
 
 var x62 = new Date(1970, 0, 1, 0, 0, 0);
@@ -98,12 +97,12 @@ if (!Date.prototype.isPrototypeOf(x62)) {
 
 var x63 = new Date(1970, 0, 1, 0, 0, 0);
 if(Date.prototype !== x63.constructor.prototype){
-  $FAIL("#6.3: Date.prototype === x63.constructor.prototype");
+  $ERROR("#6.3: Date.prototype === x63.constructor.prototype");
 }
 
 var x71 = new Date(1999, 11, 31, 23, 59, 59);
 if (typeof x71.constructor.prototype !== "object") {
-  $FAIL("#7.1: typeof x71.constructor.prototype === 'object'");
+  $ERROR("#7.1: typeof x71.constructor.prototype === 'object'");
 }
 
 var x72 = new Date(1999, 11, 31, 23, 59, 59);
@@ -113,12 +112,12 @@ if (!Date.prototype.isPrototypeOf(x72)) {
 
 var x73 = new Date(1999, 11, 31, 23, 59, 59);
 if(Date.prototype !== x73.constructor.prototype){
-  $FAIL("#7.3: Date.prototype === x73.constructor.prototype");
+  $ERROR("#7.3: Date.prototype === x73.constructor.prototype");
 }
 
 var x81 = new Date(1999, 12, 1, 0, 0, 0);
 if (typeof x81.constructor.prototype !== "object") {
-  $FAIL("#8.1: typeof x81.constructor.prototype === 'object'");
+  $ERROR("#8.1: typeof x81.constructor.prototype === 'object'");
 }
 
 var x82 = new Date(1999, 12, 1, 0, 0, 0);
@@ -128,12 +127,12 @@ if (!Date.prototype.isPrototypeOf(x82)) {
 
 var x83 = new Date(1999, 12, 1, 0, 0, 0);
 if(Date.prototype !== x83.constructor.prototype){
-  $FAIL("#8.3: Date.prototype === x83.constructor.prototype");
+  $ERROR("#8.3: Date.prototype === x83.constructor.prototype");
 }
 
 var x91 = new Date(2000, 0, 1, 0, 0, 0);
 if (typeof x91.constructor.prototype !== "object") {
-  $FAIL("#9.1: typeof x91.constructor.prototype === 'object'");
+  $ERROR("#9.1: typeof x91.constructor.prototype === 'object'");
 }
 
 var x92 = new Date(2000, 0, 1, 0, 0, 0);
@@ -143,12 +142,12 @@ if (!Date.prototype.isPrototypeOf(x92)) {
 
 var x93 = new Date(2000, 0, 1, 0, 0, 0);
 if(Date.prototype !== x93.constructor.prototype){
-  $FAIL("#9.3: Date.prototype === x93.constructor.prototype");
+  $ERROR("#9.3: Date.prototype === x93.constructor.prototype");
 }
 
 var x101 = new Date(2099, 11, 31, 23, 59, 59);
 if (typeof x101.constructor.prototype !== "object") {
-  $FAIL("#10.1: typeof x101.constructor.prototype === 'object'");
+  $ERROR("#10.1: typeof x101.constructor.prototype === 'object'");
 }
 
 var x102 = new Date(2099, 11, 31, 23, 59, 59);
@@ -158,12 +157,12 @@ if (!Date.prototype.isPrototypeOf(x102)) {
 
 var x103 = new Date(2099, 11, 31, 23, 59, 59);
 if(Date.prototype !== x103.constructor.prototype){
-  $FAIL("#10.3: Date.prototype === x103.constructor.prototype");
+  $ERROR("#10.3: Date.prototype === x103.constructor.prototype");
 }
 
 var x111 = new Date(2099, 12, 1, 0, 0, 0);
 if (typeof x111.constructor.prototype !== "object") {
-  $FAIL("#11.1: typeof x111.constructor.prototype === 'object'");
+  $ERROR("#11.1: typeof x111.constructor.prototype === 'object'");
 }
 
 var x112 = new Date(2099, 12, 1, 0, 0, 0);
@@ -173,12 +172,12 @@ if (!Date.prototype.isPrototypeOf(x112)) {
 
 var x113 = new Date(2099, 12, 1, 0, 0, 0);
 if(Date.prototype !== x113.constructor.prototype){
-  $FAIL("#11.3: Date.prototype === x113.constructor.prototype");
+  $ERROR("#11.3: Date.prototype === x113.constructor.prototype");
 }
 
 var x121 = new Date(2100, 0, 1, 0, 0, 0);
 if (typeof x121.constructor.prototype !== "object") {
-  $FAIL("#12.1: typeof x121.constructor.prototype === 'object'");
+  $ERROR("#12.1: typeof x121.constructor.prototype === 'object'");
 }
 
 var x122 = new Date(2100, 0, 1, 0, 0, 0);
@@ -188,5 +187,5 @@ if (!Date.prototype.isPrototypeOf(x122)) {
 
 var x123 = new Date(2100, 0, 1, 0, 0, 0);
 if(Date.prototype !== x123.constructor.prototype){
-  $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
+  $ERROR("#12.3: Date.prototype === x123.constructor.prototype");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A2_T6.js b/test/built-ins/Date/S15.9.3.1_A2_T6.js
index 5f1bf6d4e04272e7de2aa83b5baaae060f8b3872..93afc6bbbe2b07d92ad613bdc0aa0e0fa6c9eb7f 100644
--- a/test/built-ins/Date/S15.9.3.1_A2_T6.js
+++ b/test/built-ins/Date/S15.9.3.1_A2_T6.js
@@ -8,12 +8,11 @@ info: >
     initial value of Date.prototype
 es5id: 15.9.3.1_A2_T6
 description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
-includes: [$FAIL.js]
 ---*/
 
 var x11 = new Date(1899, 11, 31, 23, 59, 59, 999);
 if (typeof x11.constructor.prototype !== "object") {
-  $FAIL("#1.1: typeof x11.constructor.prototype === 'object'");
+  $ERROR("#1.1: typeof x11.constructor.prototype === 'object'");
 }
 
 var x12 = new Date(1899, 11, 31, 23, 59, 59, 999);
@@ -23,12 +22,12 @@ if (!Date.prototype.isPrototypeOf(x12)) {
 
 var x13 = new Date(1899, 11, 31, 23, 59, 59, 999);
 if(Date.prototype !== x13.constructor.prototype){
-  $FAIL("#1.3: Date.prototype === x13.constructor.prototype");
+  $ERROR("#1.3: Date.prototype === x13.constructor.prototype");
 }
 
 var x21 = new Date(1899, 12, 1, 0, 0, 0, 0);
 if (typeof x21.constructor.prototype !== "object") {
-  $FAIL("#2.1: typeof x21.constructor.prototype === 'object'");
+  $ERROR("#2.1: typeof x21.constructor.prototype === 'object'");
 }
 
 var x22 = new Date(1899, 12, 1, 0, 0, 0, 0);
@@ -38,12 +37,12 @@ if (!Date.prototype.isPrototypeOf(x22)) {
 
 var x23 = new Date(1899, 12, 1, 0, 0, 0, 0);
 if(Date.prototype !== x23.constructor.prototype){
-  $FAIL("#2.3: Date.prototype === x23.constructor.prototype");
+  $ERROR("#2.3: Date.prototype === x23.constructor.prototype");
 }
 
 var x31 = new Date(1900, 0, 1, 0, 0, 0, 0);
 if (typeof x31.constructor.prototype !== "object") {
-  $FAIL("#3.1: typeof x31.constructor.prototype === 'object'");
+  $ERROR("#3.1: typeof x31.constructor.prototype === 'object'");
 }
 
 var x32 = new Date(1900, 0, 1, 0, 0, 0, 0);
@@ -53,12 +52,12 @@ if (!Date.prototype.isPrototypeOf(x32)) {
 
 var x33 = new Date(1900, 0, 1, 0, 0, 0, 0);
 if(Date.prototype !== x33.constructor.prototype){
-  $FAIL("#3.3: Date.prototype === x33.constructor.prototype");
+  $ERROR("#3.3: Date.prototype === x33.constructor.prototype");
 }
 
 var x41 = new Date(1969, 11, 31, 23, 59, 59, 999);
 if (typeof x41.constructor.prototype !== "object") {
-  $FAIL("#4.1: typeof x41.constructor.prototype === 'object'");
+  $ERROR("#4.1: typeof x41.constructor.prototype === 'object'");
 }
 
 var x42 = new Date(1969, 11, 31, 23, 59, 59, 999);
@@ -68,12 +67,12 @@ if (!Date.prototype.isPrototypeOf(x42)) {
 
 var x43 = new Date(1969, 11, 31, 23, 59, 59, 999);
 if(Date.prototype !== x43.constructor.prototype){
-  $FAIL("#4.3: Date.prototype === x43.constructor.prototype");
+  $ERROR("#4.3: Date.prototype === x43.constructor.prototype");
 }
 
 var x51 = new Date(1969, 12, 1, 0, 0, 0, 0);
 if (typeof x51.constructor.prototype !== "object") {
-  $FAIL("#5.1: typeof x51.constructor.prototype === 'object'");
+  $ERROR("#5.1: typeof x51.constructor.prototype === 'object'");
 }
 
 var x52 = new Date(1969, 12, 1, 0, 0, 0, 0);
@@ -83,12 +82,12 @@ if (!Date.prototype.isPrototypeOf(x52)) {
 
 var x53 = new Date(1969, 12, 1, 0, 0, 0, 0);
 if(Date.prototype !== x53.constructor.prototype){
-  $FAIL("#5.3: Date.prototype === x53.constructor.prototype");
+  $ERROR("#5.3: Date.prototype === x53.constructor.prototype");
 }
 
 var x61 = new Date(1970, 0, 1, 0, 0, 0, 0);
 if (typeof x61.constructor.prototype !== "object") {
-  $FAIL("#6.1: typeof x61.constructor.prototype === 'object'");
+  $ERROR("#6.1: typeof x61.constructor.prototype === 'object'");
 }
 
 var x62 = new Date(1970, 0, 1, 0, 0, 0, 0);
@@ -98,12 +97,12 @@ if (!Date.prototype.isPrototypeOf(x62)) {
 
 var x63 = new Date(1970, 0, 1, 0, 0, 0, 0);
 if(Date.prototype !== x63.constructor.prototype){
-  $FAIL("#6.3: Date.prototype === x63.constructor.prototype");
+  $ERROR("#6.3: Date.prototype === x63.constructor.prototype");
 }
 
 var x71 = new Date(1999, 11, 31, 23, 59, 59, 999);
 if (typeof x71.constructor.prototype !== "object") {
-  $FAIL("#7.1: typeof x71.constructor.prototype === 'object'");
+  $ERROR("#7.1: typeof x71.constructor.prototype === 'object'");
 }
 
 var x72 = new Date(1999, 11, 31, 23, 59, 59, 999);
@@ -113,12 +112,12 @@ if (!Date.prototype.isPrototypeOf(x72)) {
 
 var x73 = new Date(1999, 11, 31, 23, 59, 59, 999);
 if(Date.prototype !== x73.constructor.prototype){
-  $FAIL("#7.3: Date.prototype === x73.constructor.prototype");
+  $ERROR("#7.3: Date.prototype === x73.constructor.prototype");
 }
 
 var x81 = new Date(1999, 12, 1, 0, 0, 0, 0);
 if (typeof x81.constructor.prototype !== "object") {
-  $FAIL("#8.1: typeof x81.constructor.prototype === 'object'");
+  $ERROR("#8.1: typeof x81.constructor.prototype === 'object'");
 }
 
 var x82 = new Date(1999, 12, 1, 0, 0, 0, 0);
@@ -128,12 +127,12 @@ if (!Date.prototype.isPrototypeOf(x82)) {
 
 var x83 = new Date(1999, 12, 1, 0, 0, 0, 0);
 if(Date.prototype !== x83.constructor.prototype){
-  $FAIL("#8.3: Date.prototype === x83.constructor.prototype");
+  $ERROR("#8.3: Date.prototype === x83.constructor.prototype");
 }
 
 var x91 = new Date(2000, 0, 1, 0, 0, 0, 0);
 if (typeof x91.constructor.prototype !== "object") {
-  $FAIL("#9.1: typeof x91.constructor.prototype === 'object'");
+  $ERROR("#9.1: typeof x91.constructor.prototype === 'object'");
 }
 
 var x92 = new Date(2000, 0, 1, 0, 0, 0, 0);
@@ -143,12 +142,12 @@ if (!Date.prototype.isPrototypeOf(x92)) {
 
 var x93 = new Date(2000, 0, 1, 0, 0, 0, 0);
 if(Date.prototype !== x93.constructor.prototype){
-  $FAIL("#9.3: Date.prototype === x93.constructor.prototype");
+  $ERROR("#9.3: Date.prototype === x93.constructor.prototype");
 }
 
 var x101 = new Date(2099, 11, 31, 23, 59, 59, 999);
 if (typeof x101.constructor.prototype !== "object") {
-  $FAIL("#10.1: typeof x101.constructor.prototype === 'object'");
+  $ERROR("#10.1: typeof x101.constructor.prototype === 'object'");
 }
 
 var x102 = new Date(2099, 11, 31, 23, 59, 59, 999);
@@ -158,12 +157,12 @@ if (!Date.prototype.isPrototypeOf(x102)) {
 
 var x103 = new Date(2099, 11, 31, 23, 59, 59, 999);
 if(Date.prototype !== x103.constructor.prototype){
-  $FAIL("#10.3: Date.prototype === x103.constructor.prototype");
+  $ERROR("#10.3: Date.prototype === x103.constructor.prototype");
 }
 
 var x111 = new Date(2099, 12, 1, 0, 0, 0, 0);
 if (typeof x111.constructor.prototype !== "object") {
-  $FAIL("#11.1: typeof x111.constructor.prototype === 'object'");
+  $ERROR("#11.1: typeof x111.constructor.prototype === 'object'");
 }
 
 var x112 = new Date(2099, 12, 1, 0, 0, 0, 0);
@@ -173,12 +172,12 @@ if (!Date.prototype.isPrototypeOf(x112)) {
 
 var x113 = new Date(2099, 12, 1, 0, 0, 0, 0);
 if(Date.prototype !== x113.constructor.prototype){
-  $FAIL("#11.3: Date.prototype === x113.constructor.prototype");
+  $ERROR("#11.3: Date.prototype === x113.constructor.prototype");
 }
 
 var x121 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if (typeof x121.constructor.prototype !== "object") {
-  $FAIL("#12.1: typeof x121.constructor.prototype === 'object'");
+  $ERROR("#12.1: typeof x121.constructor.prototype === 'object'");
 }
 
 var x122 = new Date(2100, 0, 1, 0, 0, 0, 0);
@@ -188,5 +187,5 @@ if (!Date.prototype.isPrototypeOf(x122)) {
 
 var x123 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if(Date.prototype !== x123.constructor.prototype){
-  $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
+  $ERROR("#12.3: Date.prototype === x123.constructor.prototype");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T1.1.js b/test/built-ins/Date/S15.9.3.1_A3_T1.1.js
index 38afe9c9df4ed8e5d4747ccd376621e9c5b9d23b..6194c0147d19ccb8242b2840ac22fbcb97fa1c51 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T1.1.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T1.1.js
@@ -9,65 +9,64 @@ es5id: 15.9.3.1_A3_T1.1
 description: >
     Test based on delete prototype.toString - 2 arguments, (year,
     month)
-includes: [$FAIL.js]
 ---*/
 
 var x1 = new Date(1899, 11);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12);
 if (Object.prototype.toString.call(x2) !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0);
 if (Object.prototype.toString.call(x3) !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11);
 if (Object.prototype.toString.call(x4) !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12);
 if (Object.prototype.toString.call(x5) !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0);
 if (Object.prototype.toString.call(x6) !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11);
 if (Object.prototype.toString.call(x7) !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12);
 if (Object.prototype.toString.call(x8) !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0);
 if (Object.prototype.toString.call(x9) !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11);
 if (Object.prototype.toString.call(x10) !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12);
 if (Object.prototype.toString.call(x11) !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T1.2.js b/test/built-ins/Date/S15.9.3.1_A3_T1.2.js
index 4bab7cb478ea6b42eb7220fd87d5274ba1774b5c..b1c01700de6b62be25314eef6fc78f8f2d46e56c 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T1.2.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T1.2.js
@@ -9,67 +9,66 @@ es5id: 15.9.3.1_A3_T1.2
 description: >
     Test based on overwriting prototype.toString - 2 arguments, (year,
     month)
-includes: [$FAIL.js]
 ---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
 var x1 = new Date(1899, 11);
 if (x1.toString() !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12);
 if (x2.toString() !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0);
 if (x3.toString() !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11);
 if (x4.toString() !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12);
 if (x5.toString() !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0);
 if (x6.toString() !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11);
 if (x7.toString() !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12);
 if (x8.toString() !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0);
 if (x9.toString() !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11);
 if (x10.toString() !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12);
 if (x11.toString() !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0);
 if (x12.toString() !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T2.1.js b/test/built-ins/Date/S15.9.3.1_A3_T2.1.js
index f35c0f5af41d7a837ce94e47ce15e85ea9c187bb..58ed13cb3f6818845e7944fbe2dc07a5f7ab0df3 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T2.1.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T2.1.js
@@ -9,65 +9,64 @@ es5id: 15.9.3.1_A3_T2.1
 description: >
     Test based on delete prototype.toString - 3 arguments, (year,
     month, date)
-includes: [$FAIL.js]
 ---*/
 
 var x1 = new Date(1899, 11, 31);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1);
 if (Object.prototype.toString.call(x2) !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1);
 if (Object.prototype.toString.call(x3) !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31);
 if (Object.prototype.toString.call(x4) !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1);
 if (Object.prototype.toString.call(x5) !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1);
 if (Object.prototype.toString.call(x6) !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31);
 if (Object.prototype.toString.call(x7) !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1);
 if (Object.prototype.toString.call(x8) !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1);
 if (Object.prototype.toString.call(x9) !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31);
 if (Object.prototype.toString.call(x10) !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1);
 if (Object.prototype.toString.call(x11) !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T2.2.js b/test/built-ins/Date/S15.9.3.1_A3_T2.2.js
index 525bda9a2fb7b03a84885c479f7ea5fcc7b40648..308f5cb3fff629e7f5c9fe06135af5b0f5b8b889 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T2.2.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T2.2.js
@@ -9,67 +9,66 @@ es5id: 15.9.3.1_A3_T2.2
 description: >
     Test based on overwriting prototype.toString - 3 arguments, (year,
     month, date)
-includes: [$FAIL.js]
 ---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
 var x1 = new Date(1899, 11, 31);
 if (x1.toString() !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1);
 if (x2.toString() !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1);
 if (x3.toString() !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31);
 if (x4.toString() !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1);
 if (x5.toString() !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1);
 if (x6.toString() !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31);
 if (x7.toString() !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1);
 if (x8.toString() !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1);
 if (x9.toString() !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31);
 if (x10.toString() !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1);
 if (x11.toString() !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1);
 if (x12.toString() !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T3.1.js b/test/built-ins/Date/S15.9.3.1_A3_T3.1.js
index 8c8f4399bad048c2372b63259cd31ab63ee726b3..b900e98561b8e97378c777e3831f1e1de13c770f 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T3.1.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T3.1.js
@@ -9,65 +9,64 @@ es5id: 15.9.3.1_A3_T3.1
 description: >
     Test based on delete prototype.toString - 4 arguments, (year,
     month, date, hours)
-includes: [$FAIL.js]
 ---*/
 
 var x1 = new Date(1899, 11, 31, 23);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1, 0);
 if (Object.prototype.toString.call(x2) !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1, 0);
 if (Object.prototype.toString.call(x3) !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31, 23);
 if (Object.prototype.toString.call(x4) !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1, 0);
 if (Object.prototype.toString.call(x5) !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1, 0);
 if (Object.prototype.toString.call(x6) !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31, 23);
 if (Object.prototype.toString.call(x7) !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1, 0);
 if (Object.prototype.toString.call(x8) !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1, 0);
 if (Object.prototype.toString.call(x9) !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31, 23);
 if (Object.prototype.toString.call(x10) !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1, 0);
 if (Object.prototype.toString.call(x11) !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T3.2.js b/test/built-ins/Date/S15.9.3.1_A3_T3.2.js
index 7333eb13702be762e5f2631385911c82f53cb61b..821f34ffd97a13350a200e4a3f598d68bc6c6976 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T3.2.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T3.2.js
@@ -9,67 +9,66 @@ es5id: 15.9.3.1_A3_T3.2
 description: >
     Test based on overwriting prototype.toString - 4 arguments, (year,
     month, date, hours)
-includes: [$FAIL.js]
 ---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
 var x1 = new Date(1899, 11, 31, 23);
 if (x1.toString() !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1, 0);
 if (x2.toString() !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1, 0);
 if (x3.toString() !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31, 23);
 if (x4.toString() !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1, 0);
 if (x5.toString() !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1, 0);
 if (x6.toString() !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31, 23);
 if (x7.toString() !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1, 0);
 if (x8.toString() !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1, 0);
 if (x9.toString() !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31, 23);
 if (x10.toString() !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1, 0);
 if (x11.toString() !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1, 0);
 if (x12.toString() !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T4.1.js b/test/built-ins/Date/S15.9.3.1_A3_T4.1.js
index c5ba02751ed6c2c2c0b61c60ca51b50f6f8d1cc3..890916f9b61e6559103d1469338bd124b67218a4 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T4.1.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T4.1.js
@@ -9,65 +9,64 @@ es5id: 15.9.3.1_A3_T4.1
 description: >
     Test based on delete prototype.toString - 5 arguments, (year,
     month, date, hours, minutes)
-includes: [$FAIL.js]
 ---*/
 
 var x1 = new Date(1899, 11, 31, 23, 59);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1, 0, 0);
 if (Object.prototype.toString.call(x2) !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1, 0, 0);
 if (Object.prototype.toString.call(x3) !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31, 23, 59);
 if (Object.prototype.toString.call(x4) !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1, 0, 0);
 if (Object.prototype.toString.call(x5) !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1, 0, 0);
 if (Object.prototype.toString.call(x6) !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31, 23, 59);
 if (Object.prototype.toString.call(x7) !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1, 0, 0);
 if (Object.prototype.toString.call(x8) !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1, 0, 0);
 if (Object.prototype.toString.call(x9) !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31, 23, 59);
 if (Object.prototype.toString.call(x10) !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1, 0, 0);
 if (Object.prototype.toString.call(x11) !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1, 0, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T4.2.js b/test/built-ins/Date/S15.9.3.1_A3_T4.2.js
index c9f3ffb77f9af4f9cfeeedada57fed7857a810a2..711936dde768ea66e41606b547d468e16b68244f 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T4.2.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T4.2.js
@@ -9,67 +9,66 @@ es5id: 15.9.3.1_A3_T4.2
 description: >
     Test based on overwriting prototype.toString - 5 arguments, (year,
     month, date, hours, minutes)
-includes: [$FAIL.js]
 ---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
 var x1 = new Date(1899, 11, 31, 23, 59);
 if (x1.toString() !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1, 0, 0);
 if (x2.toString() !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1, 0, 0);
 if (x3.toString() !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31, 23, 59);
 if (x4.toString() !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1, 0, 0);
 if (x5.toString() !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1, 0, 0);
 if (x6.toString() !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31, 23, 59);
 if (x7.toString() !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1, 0, 0);
 if (x8.toString() !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1, 0, 0);
 if (x9.toString() !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31, 23, 59);
 if (x10.toString() !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1, 0, 0);
 if (x11.toString() !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1, 0, 0);
 if (x12.toString() !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T5.1.js b/test/built-ins/Date/S15.9.3.1_A3_T5.1.js
index d9939d3af32f028c293c2852e8cd4d99433dab60..d7d84bbf8e5c548e4914dc82cdf8092492184c03 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T5.1.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T5.1.js
@@ -7,65 +7,64 @@ info: >
     is set to "Date"
 es5id: 15.9.3.1_A3_T5.1
 description: 6 arguments, (year, month, date, hours, minutes, seconds)
-includes: [$FAIL.js]
 ---*/
 
 var x1 = new Date(1899, 11, 31, 23, 59, 59);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1, 0, 0, 0);
 if (Object.prototype.toString.call(x2) !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1, 0, 0, 0);
 if (Object.prototype.toString.call(x3) !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31, 23, 59, 59);
 if (Object.prototype.toString.call(x4) !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1, 0, 0, 0);
 if (Object.prototype.toString.call(x5) !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1, 0, 0, 0);
 if (Object.prototype.toString.call(x6) !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31, 23, 59, 59);
 if (Object.prototype.toString.call(x7) !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1, 0, 0, 0);
 if (Object.prototype.toString.call(x8) !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1, 0, 0, 0);
 if (Object.prototype.toString.call(x9) !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31, 23, 59, 59);
 if (Object.prototype.toString.call(x10) !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1, 0, 0, 0);
 if (Object.prototype.toString.call(x11) !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1, 0, 0, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T5.2.js b/test/built-ins/Date/S15.9.3.1_A3_T5.2.js
index 49bf00daa82aad3ff652100fc044ce4f848a424a..6782eea9d4a692ce2f60ea15fa11f6fd4a072ab8 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T5.2.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T5.2.js
@@ -9,67 +9,66 @@ es5id: 15.9.3.1_A3_T5.2
 description: >
     Test based on overwriting prototype.toString - 6 arguments, (year,
     month, date, hours, minutes, seconds)
-includes: [$FAIL.js]
 ---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
 var x1 = new Date(1899, 11, 31, 23, 59, 59);
 if (x1.toString() !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1, 0, 0, 0);
 if (x2.toString() !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1, 0, 0, 0);
 if (x3.toString() !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31, 23, 59, 59);
 if (x4.toString() !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1, 0, 0, 0);
 if (x5.toString() !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1, 0, 0, 0);
 if (x6.toString() !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31, 23, 59, 59);
 if (x7.toString() !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1, 0, 0, 0);
 if (x8.toString() !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1, 0, 0, 0);
 if (x9.toString() !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31, 23, 59, 59);
 if (x10.toString() !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1, 0, 0, 0);
 if (x11.toString() !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1, 0, 0, 0);
 if (x12.toString() !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T6.1.js b/test/built-ins/Date/S15.9.3.1_A3_T6.1.js
index f30517bf176ea0071df33785dacc019cb36ac992..fad126a32b3ebf6f5535290adac85b59ad187fb1 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T6.1.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T6.1.js
@@ -7,65 +7,64 @@ info: >
     is set to "Date"
 es5id: 15.9.3.1_A3_T6.1
 description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
-includes: [$FAIL.js]
 ---*/
 
 var x1 = new Date(1899, 11, 31, 23, 59, 59, 999);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1, 0, 0, 0, 0);
 if (Object.prototype.toString.call(x2) !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1, 0, 0, 0, 0);
 if (Object.prototype.toString.call(x3) !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31, 23, 59, 59, 999);
 if (Object.prototype.toString.call(x4) !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1, 0, 0, 0, 0);
 if (Object.prototype.toString.call(x5) !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1, 0, 0, 0, 0);
 if (Object.prototype.toString.call(x6) !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31, 23, 59, 59, 999);
 if (Object.prototype.toString.call(x7) !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1, 0, 0, 0, 0);
 if (Object.prototype.toString.call(x8) !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1, 0, 0, 0, 0);
 if (Object.prototype.toString.call(x9) !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31, 23, 59, 59, 999);
 if (Object.prototype.toString.call(x10) !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1, 0, 0, 0, 0);
 if (Object.prototype.toString.call(x11) !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A3_T6.2.js b/test/built-ins/Date/S15.9.3.1_A3_T6.2.js
index 47587a917a8bbdc7f213b7253d69e8c3dd296dfb..5da9fdf46501260fafc022f4fd2d07e2fbcfe41b 100644
--- a/test/built-ins/Date/S15.9.3.1_A3_T6.2.js
+++ b/test/built-ins/Date/S15.9.3.1_A3_T6.2.js
@@ -9,67 +9,66 @@ es5id: 15.9.3.1_A3_T6.2
 description: >
     Test based on overwriting prototype.toString - 7 arguments, (year,
     month, date, hours, minutes, seconds, ms)
-includes: [$FAIL.js]
 ---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
 var x1 = new Date(1899, 11, 31, 23, 59, 59, 999);
 if (x1.toString() !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(1899, 12, 1, 0, 0, 0, 0);
 if (x2.toString() !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(1900, 0, 1, 0, 0, 0, 0);
 if (x3.toString() !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(1969, 11, 31, 23, 59, 59, 999);
 if (x4.toString() !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(1969, 12, 1, 0, 0, 0, 0);
 if (x5.toString() !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(1970, 0, 1, 0, 0, 0, 0);
 if (x6.toString() !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(1999, 11, 31, 23, 59, 59, 999);
 if (x7.toString() !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(1999, 12, 1, 0, 0, 0, 0);
 if (x8.toString() !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x9 = new Date(2000, 0, 1, 0, 0, 0, 0);
 if (x9.toString() !== "[object Date]") {
-  $FAIL("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#9: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x10 = new Date(2099, 11, 31, 23, 59, 59, 999);
 if (x10.toString() !== "[object Date]") {
-  $FAIL("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#10: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x11 = new Date(2099, 12, 1, 0, 0, 0, 0);
 if (x11.toString() !== "[object Date]") {
-  $FAIL("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#11: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x12 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if (x12.toString() !== "[object Date]") {
-  $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A5_T1.js b/test/built-ins/Date/S15.9.3.1_A5_T1.js
index 8dc438f3a2d3465fb2df340634c8a2aa4b41165d..ea1e41797cb258c871b4ff021f19b0a1c9c0eda2 100644
--- a/test/built-ins/Date/S15.9.3.1_A5_T1.js
+++ b/test/built-ins/Date/S15.9.3.1_A5_T1.js
@@ -15,7 +15,6 @@ info: >
 es5id: 15.9.3.1_A5_T1
 description: 2 arguments, (year, month)
 includes:
-    - $FAIL.js
     - environment.js
     - numeric_conversion.js
     - Date_constants.js
@@ -23,49 +22,49 @@ includes:
 ---*/
 
 if (-2211638400000 !== new Date(1899, 11).valueOf()) {
-  $FAIL("#1: Incorrect value of Date");
+  $ERROR("#1: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1899, 12).valueOf()) {
-  $FAIL("#2: Incorrect value of Date");
+  $ERROR("#2: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1900, 0).valueOf()) {
-  $FAIL("#3: Incorrect value of Date");
+  $ERROR("#3: Incorrect value of Date");
 }
 
 if (-2649600000 !== new Date(1969, 11).valueOf()) {
-  $FAIL("#4: Incorrect value of Date");
+  $ERROR("#4: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1969, 12).valueOf()) {
-  $FAIL("#5: Incorrect value of Date");
+  $ERROR("#5: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1970, 0).valueOf()) {
-  $FAIL("#6: Incorrect value of Date");
+  $ERROR("#6: Incorrect value of Date");
 }
 
 if (944035200000 !== new Date(1999, 11).valueOf()) {
-  $FAIL("#7: Incorrect value of Date");
+  $ERROR("#7: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(1999, 12).valueOf()) {
-  $FAIL("#8: Incorrect value of Date");
+  $ERROR("#8: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(2000, 0).valueOf()) {
-  $FAIL("#9: Incorrect value of Date");
+  $ERROR("#9: Incorrect value of Date");
 }
 
 if (4099795200000 !== new Date(2099, 11).valueOf()) {
-  $FAIL("#10: Incorrect value of Date");
+  $ERROR("#10: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2099, 12).valueOf()) {
-  $FAIL("#11: Incorrect value of Date");
+  $ERROR("#11: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2100, 0).valueOf()) {
-  $FAIL("#12: Incorrect value of Date");
+  $ERROR("#12: Incorrect value of Date");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A5_T2.js b/test/built-ins/Date/S15.9.3.1_A5_T2.js
index 81a1f8cd9bfc839725bf50fd640cf6864014e9ee..cf0183c6d3b4b9dbccd93d55ddb7c3484ceabc94 100644
--- a/test/built-ins/Date/S15.9.3.1_A5_T2.js
+++ b/test/built-ins/Date/S15.9.3.1_A5_T2.js
@@ -15,7 +15,6 @@ info: >
 es5id: 15.9.3.1_A5_T2
 description: 3 arguments, (year, month, date)
 includes:
-    - $FAIL.js
     - environment.js
     - numeric_conversion.js
     - Date_constants.js
@@ -23,49 +22,49 @@ includes:
 ---*/
 
 if (-2209046400000 !== new Date(1899, 11, 31).valueOf()) {
-  $FAIL("#1: Incorrect value of Date");
+  $ERROR("#1: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1899, 12, 1).valueOf()) {
-  $FAIL("#2: Incorrect value of Date");
+  $ERROR("#2: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1900, 0, 1).valueOf()) {
-  $FAIL("#3: Incorrect value of Date");
+  $ERROR("#3: Incorrect value of Date");
 }
 
 if (-57600000 !== new Date(1969, 11, 31).valueOf()) {
-  $FAIL("#4: Incorrect value of Date");
+  $ERROR("#4: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1969, 12, 1).valueOf()) {
-  $FAIL("#5: Incorrect value of Date");
+  $ERROR("#5: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1970, 0, 1).valueOf()) {
-  $FAIL("#6: Incorrect value of Date");
+  $ERROR("#6: Incorrect value of Date");
 }
 
 if (946627200000 !== new Date(1999, 11, 31).valueOf()) {
-  $FAIL("#7: Incorrect value of Date");
+  $ERROR("#7: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(1999, 12, 1).valueOf()) {
-  $FAIL("#8: Incorrect value of Date");
+  $ERROR("#8: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(2000, 0, 1).valueOf()) {
-  $FAIL("#9: Incorrect value of Date");
+  $ERROR("#9: Incorrect value of Date");
 }
 
 if (4102387200000 !== new Date(2099, 11, 31).valueOf()) {
-  $FAIL("#10: Incorrect value of Date");
+  $ERROR("#10: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2099, 12, 1).valueOf()) {
-  $FAIL("#11: Incorrect value of Date");
+  $ERROR("#11: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2100, 0, 1).valueOf()) {
-  $FAIL("#12: Incorrect value of Date");
+  $ERROR("#12: Incorrect value of Date");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A5_T3.js b/test/built-ins/Date/S15.9.3.1_A5_T3.js
index 70bad4bd82a21f19b00d6b989d26e1524c3d514e..757060b8304323a4cebceb0d5a7137f11d4e0018 100644
--- a/test/built-ins/Date/S15.9.3.1_A5_T3.js
+++ b/test/built-ins/Date/S15.9.3.1_A5_T3.js
@@ -15,7 +15,6 @@ info: >
 es5id: 15.9.3.1_A5_T3
 description: 4 arguments, (year, month, date, hours)
 includes:
-    - $FAIL.js
     - environment.js
     - numeric_conversion.js
     - Date_constants.js
@@ -23,49 +22,49 @@ includes:
 ---*/
 
 if (-2208963600000 !== new Date(1899, 11, 31, 23).valueOf()) {
-  $FAIL("#1: Incorrect value of Date");
+  $ERROR("#1: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1899, 12, 1, 0).valueOf()) {
-  $FAIL("#2: Incorrect value of Date");
+  $ERROR("#2: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1900, 0, 1, 0).valueOf()) {
-  $FAIL("#3: Incorrect value of Date");
+  $ERROR("#3: Incorrect value of Date");
 }
 
 if (25200000 !== new Date(1969, 11, 31, 23).valueOf()) {
-  $FAIL("#4: Incorrect value of Date");
+  $ERROR("#4: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1969, 12, 1, 0).valueOf()) {
-  $FAIL("#5: Incorrect value of Date");
+  $ERROR("#5: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1970, 0, 1, 0).valueOf()) {
-  $FAIL("#6: Incorrect value of Date");
+  $ERROR("#6: Incorrect value of Date");
 }
 
 if (946710000000 !== new Date(1999, 11, 31, 23).valueOf()) {
-  $FAIL("#7: Incorrect value of Date");
+  $ERROR("#7: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(1999, 12, 1, 0).valueOf()) {
-  $FAIL("#8: Incorrect value of Date");
+  $ERROR("#8: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(2000, 0, 1, 0).valueOf()) {
-  $FAIL("#9: Incorrect value of Date");
+  $ERROR("#9: Incorrect value of Date");
 }
 
 if (4102470000000 !== new Date(2099, 11, 31, 23).valueOf()) {
-  $FAIL("#10: Incorrect value of Date");
+  $ERROR("#10: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2099, 12, 1, 0).valueOf()) {
-  $FAIL("#11: Incorrect value of Date");
+  $ERROR("#11: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2100, 0, 1, 0).valueOf()) {
-  $FAIL("#12: Incorrect value of Date");
+  $ERROR("#12: Incorrect value of Date");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A5_T4.js b/test/built-ins/Date/S15.9.3.1_A5_T4.js
index 542d9cdba0b364f1a44a44896033ab8208257fa5..e4ac99657a4f8628fad6578a27ce74a13930a029 100644
--- a/test/built-ins/Date/S15.9.3.1_A5_T4.js
+++ b/test/built-ins/Date/S15.9.3.1_A5_T4.js
@@ -15,7 +15,6 @@ info: >
 es5id: 15.9.3.1_A5_T4
 description: 5 arguments, (year, month, date, hours, minutes)
 includes:
-    - $FAIL.js
     - environment.js
     - numeric_conversion.js
     - Date_constants.js
@@ -23,49 +22,49 @@ includes:
 ---*/
 
 if (-2208960060000 !== new Date(1899, 11, 31, 23, 59).valueOf()) {
-  $FAIL("#1: Incorrect value of Date");
+  $ERROR("#1: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1899, 12, 1, 0, 0).valueOf()) {
-  $FAIL("#2: Incorrect value of Date");
+  $ERROR("#2: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1900, 0, 1, 0, 0).valueOf()) {
-  $FAIL("#3: Incorrect value of Date");
+  $ERROR("#3: Incorrect value of Date");
 }
 
 if (28740000 !== new Date(1969, 11, 31, 23, 59).valueOf()) {
-  $FAIL("#4: Incorrect value of Date");
+  $ERROR("#4: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1969, 12, 1, 0, 0).valueOf()) {
-  $FAIL("#5: Incorrect value of Date");
+  $ERROR("#5: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1970, 0, 1, 0, 0).valueOf()) {
-  $FAIL("#6: Incorrect value of Date");
+  $ERROR("#6: Incorrect value of Date");
 }
 
 if (946713540000 !== new Date(1999, 11, 31, 23, 59).valueOf()) {
-  $FAIL("#7: Incorrect value of Date");
+  $ERROR("#7: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(1999, 12, 1, 0, 0).valueOf()) {
-  $FAIL("#8: Incorrect value of Date");
+  $ERROR("#8: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(2000, 0, 1, 0, 0).valueOf()) {
-  $FAIL("#9: Incorrect value of Date");
+  $ERROR("#9: Incorrect value of Date");
 }
 
 if (4102473540000 !== new Date(2099, 11, 31, 23, 59).valueOf()) {
-  $FAIL("#10: Incorrect value of Date");
+  $ERROR("#10: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2099, 12, 1, 0, 0).valueOf()) {
-  $FAIL("#11: Incorrect value of Date");
+  $ERROR("#11: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2100, 0, 1, 0, 0).valueOf()) {
-  $FAIL("#12: Incorrect value of Date");
+  $ERROR("#12: Incorrect value of Date");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A5_T5.js b/test/built-ins/Date/S15.9.3.1_A5_T5.js
index 49afa28eb61dd4e185edf51716e6c92bce24fcf0..050099eaf1566a9d7f3203c98cc698cd838e8edf 100644
--- a/test/built-ins/Date/S15.9.3.1_A5_T5.js
+++ b/test/built-ins/Date/S15.9.3.1_A5_T5.js
@@ -15,7 +15,6 @@ info: >
 es5id: 15.9.3.1_A5_T5
 description: 6 arguments, (year, month, date, hours, minutes, seconds)
 includes:
-    - $FAIL.js
     - environment.js
     - numeric_conversion.js
     - Date_constants.js
@@ -23,49 +22,49 @@ includes:
 ---*/
 
 if (-2208960001000 !== new Date(1899, 11, 31, 23, 59, 59).valueOf()) {
-  $FAIL("#1: Incorrect value of Date");
+  $ERROR("#1: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1899, 12, 1, 0, 0, 0).valueOf()) {
-  $FAIL("#2: Incorrect value of Date");
+  $ERROR("#2: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1900, 0, 1, 0, 0, 0).valueOf()) {
-  $FAIL("#3: Incorrect value of Date");
+  $ERROR("#3: Incorrect value of Date");
 }
 
 if (28799000 !== new Date(1969, 11, 31, 23, 59, 59).valueOf()) {
-  $FAIL("#4: Incorrect value of Date");
+  $ERROR("#4: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1969, 12, 1, 0, 0, 0).valueOf()) {
-  $FAIL("#5: Incorrect value of Date");
+  $ERROR("#5: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1970, 0, 1, 0, 0, 0).valueOf()) {
-  $FAIL("#6: Incorrect value of Date");
+  $ERROR("#6: Incorrect value of Date");
 }
 
 if (946713599000 !== new Date(1999, 11, 31, 23, 59, 59).valueOf()) {
-  $FAIL("#7: Incorrect value of Date");
+  $ERROR("#7: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(1999, 12, 1, 0, 0, 0).valueOf()) {
-  $FAIL("#8: Incorrect value of Date");
+  $ERROR("#8: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(2000, 0, 1, 0, 0, 0).valueOf()) {
-  $FAIL("#9: Incorrect value of Date");
+  $ERROR("#9: Incorrect value of Date");
 }
 
 if (4102473599000 !== new Date(2099, 11, 31, 23, 59, 59).valueOf()) {
-  $FAIL("#10: Incorrect value of Date");
+  $ERROR("#10: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2099, 12, 1, 0, 0, 0).valueOf()) {
-  $FAIL("#11: Incorrect value of Date");
+  $ERROR("#11: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2100, 0, 1, 0, 0, 0).valueOf()) {
-  $FAIL("#12: Incorrect value of Date");
+  $ERROR("#12: Incorrect value of Date");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A5_T6.js b/test/built-ins/Date/S15.9.3.1_A5_T6.js
index cdfc38245d3b9d46047eb77000f98cb07930002b..b67082700ca71790b917617b6ccbe415ffe225fa 100644
--- a/test/built-ins/Date/S15.9.3.1_A5_T6.js
+++ b/test/built-ins/Date/S15.9.3.1_A5_T6.js
@@ -15,7 +15,6 @@ info: >
 es5id: 15.9.3.1_A5_T6
 description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
 includes:
-    - $FAIL.js
     - environment.js
     - numeric_conversion.js
     - Date_constants.js
@@ -23,49 +22,49 @@ includes:
 ---*/
 
 if (-2208960000001 !== new Date(1899, 11, 31, 23, 59, 59, 999).valueOf()) {
-  $FAIL("#1: Incorrect value of Date");
+  $ERROR("#1: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1899, 12, 1, 0, 0, 0, 0).valueOf()) {
-  $FAIL("#2: Incorrect value of Date");
+  $ERROR("#2: Incorrect value of Date");
 }
 
 if (-2208960000000 !== new Date(1900, 0, 1, 0, 0, 0, 0).valueOf()) {
-  $FAIL("#3: Incorrect value of Date");
+  $ERROR("#3: Incorrect value of Date");
 }
 
 if (28799999 !== new Date(1969, 11, 31, 23, 59, 59, 999).valueOf()) {
-  $FAIL("#4: Incorrect value of Date");
+  $ERROR("#4: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1969, 12, 1, 0, 0, 0, 0).valueOf()) {
-  $FAIL("#5: Incorrect value of Date");
+  $ERROR("#5: Incorrect value of Date");
 }
 
 if (28800000 !== new Date(1970, 0, 1, 0, 0, 0, 0).valueOf()) {
-  $FAIL("#6: Incorrect value of Date");
+  $ERROR("#6: Incorrect value of Date");
 }
 
 if (946713599999 !== new Date(1999, 11, 31, 23, 59, 59, 999).valueOf()) {
-  $FAIL("#7: Incorrect value of Date");
+  $ERROR("#7: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(1999, 12, 1, 0, 0, 0, 0).valueOf()) {
-  $FAIL("#8: Incorrect value of Date");
+  $ERROR("#8: Incorrect value of Date");
 }
 
 if (946713600000 !== new Date(2000, 0, 1, 0, 0, 0, 0).valueOf()) {
-  $FAIL("#9: Incorrect value of Date");
+  $ERROR("#9: Incorrect value of Date");
 }
 
 if (4102473599999 !== new Date(2099, 11, 31, 23, 59, 59, 999).valueOf()) {
-  $FAIL("#10: Incorrect value of Date");
+  $ERROR("#10: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2099, 12, 1, 0, 0, 0, 0).valueOf()) {
-  $FAIL("#11: Incorrect value of Date");
+  $ERROR("#11: Incorrect value of Date");
 }
 
 if (4102473600000 !== new Date(2100, 0, 1, 0, 0, 0, 0).valueOf()) {
-  $FAIL("#12: Incorrect value of Date");
+  $ERROR("#12: Incorrect value of Date");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A6_T1.js b/test/built-ins/Date/S15.9.3.1_A6_T1.js
index 9aad96596eb19f94e868404912f5348266133dbf..37a89a73f56c5ec7ae1fd6bf96a77196c829c3c6 100644
--- a/test/built-ins/Date/S15.9.3.1_A6_T1.js
+++ b/test/built-ins/Date/S15.9.3.1_A6_T1.js
@@ -7,7 +7,6 @@ info: >
     with supplied "undefined" argument should be NaN
 es5id: 15.9.3.1_A6_T1
 description: 2 arguments, (year, month)
-includes: [$FAIL.js]
 ---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
@@ -15,49 +14,49 @@ function DateValue(year, month, date, hours, minutes, seconds, ms){
 }
 
 if (!isNaN(DateValue(1899, 11))) {
-  $FAIL("#1: The value should be NaN");
+  $ERROR("#1: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1899, 12))) {
-  $FAIL("#2: The value should be NaN");
+  $ERROR("#2: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1900, 0))) {
-  $FAIL("#3: The value should be NaN");
+  $ERROR("#3: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 11))) {
-  $FAIL("#4: The value should be NaN");
+  $ERROR("#4: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 12))) {
-  $FAIL("#5: The value should be NaN");
+  $ERROR("#5: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1970, 0))) {
-  $FAIL("#6: The value should be NaN");
+  $ERROR("#6: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 11))) {
-  $FAIL("#7: The value should be NaN");
+  $ERROR("#7: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 12))) {
-  $FAIL("#8: The value should be NaN");
+  $ERROR("#8: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2000, 0))) {
-  $FAIL("#9: The value should be NaN");
+  $ERROR("#9: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 11))) {
-  $FAIL("#10: The value should be NaN");
+  $ERROR("#10: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 12))) {
-  $FAIL("#11: The value should be NaN");
+  $ERROR("#11: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2100, 0))) {
-  $FAIL("#12: The value should be NaN");
+  $ERROR("#12: The value should be NaN");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A6_T2.js b/test/built-ins/Date/S15.9.3.1_A6_T2.js
index 80edd4d62f8d9f88b866348555c884026008a167..0d6650cca3218e59d95896fb64920dd393329321 100644
--- a/test/built-ins/Date/S15.9.3.1_A6_T2.js
+++ b/test/built-ins/Date/S15.9.3.1_A6_T2.js
@@ -7,7 +7,6 @@ info: >
     with supplied "undefined" argument should be NaN
 es5id: 15.9.3.1_A6_T2
 description: 3 arguments, (year, month, date)
-includes: [$FAIL.js]
 ---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
@@ -15,49 +14,49 @@ function DateValue(year, month, date, hours, minutes, seconds, ms){
 }
 
 if (!isNaN(DateValue(1899, 11, 31))) {
-  $FAIL("#1: The value should be NaN");
+  $ERROR("#1: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1899, 12, 1))) {
-  $FAIL("#2: The value should be NaN");
+  $ERROR("#2: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1900, 0, 1))) {
-  $FAIL("#3: The value should be NaN");
+  $ERROR("#3: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 11, 31))) {
-  $FAIL("#4: The value should be NaN");
+  $ERROR("#4: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 12, 1))) {
-  $FAIL("#5: The value should be NaN");
+  $ERROR("#5: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1970, 0, 1))) {
-  $FAIL("#6: The value should be NaN");
+  $ERROR("#6: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 11, 31))) {
-  $FAIL("#7: The value should be NaN");
+  $ERROR("#7: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 12, 1))) {
-  $FAIL("#8: The value should be NaN");
+  $ERROR("#8: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2000, 0, 1))) {
-  $FAIL("#9: The value should be NaN");
+  $ERROR("#9: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 11, 31))) {
-  $FAIL("#10: The value should be NaN");
+  $ERROR("#10: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 12, 1))) {
-  $FAIL("#11: The value should be NaN");
+  $ERROR("#11: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2100, 0, 1))) {
-  $FAIL("#12: The value should be NaN");
+  $ERROR("#12: The value should be NaN");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A6_T3.js b/test/built-ins/Date/S15.9.3.1_A6_T3.js
index 15a9b1599779baca0c65819bab292e1e443f5cd5..fdd8b27b548ad0e1ce945bf7405144e7f6a83928 100644
--- a/test/built-ins/Date/S15.9.3.1_A6_T3.js
+++ b/test/built-ins/Date/S15.9.3.1_A6_T3.js
@@ -7,7 +7,6 @@ info: >
     with supplied "undefined" argument should be NaN
 es5id: 15.9.3.1_A6_T3
 description: 4 arguments, (year, month, date, hours)
-includes: [$FAIL.js]
 ---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
@@ -15,49 +14,49 @@ function DateValue(year, month, date, hours, minutes, seconds, ms){
 }
 
 if (!isNaN(DateValue(1899, 11, 31, 23))) {
-  $FAIL("#1: The value should be NaN");
+  $ERROR("#1: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1899, 12, 1, 0))) {
-  $FAIL("#2: The value should be NaN");
+  $ERROR("#2: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1900, 0, 1, 0))) {
-  $FAIL("#3: The value should be NaN");
+  $ERROR("#3: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 11, 31, 23))) {
-  $FAIL("#4: The value should be NaN");
+  $ERROR("#4: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 12, 1, 0))) {
-  $FAIL("#5: The value should be NaN");
+  $ERROR("#5: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1970, 0, 1, 0))) {
-  $FAIL("#6: The value should be NaN");
+  $ERROR("#6: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 11, 31, 23))) {
-  $FAIL("#7: The value should be NaN");
+  $ERROR("#7: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 12, 1, 0))) {
-  $FAIL("#8: The value should be NaN");
+  $ERROR("#8: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2000, 0, 1, 0))) {
-  $FAIL("#9: The value should be NaN");
+  $ERROR("#9: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 11, 31, 23))) {
-  $FAIL("#10: The value should be NaN");
+  $ERROR("#10: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 12, 1, 0))) {
-  $FAIL("#11: The value should be NaN");
+  $ERROR("#11: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2100, 0, 1, 0))) {
-  $FAIL("#12: The value should be NaN");
+  $ERROR("#12: The value should be NaN");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A6_T4.js b/test/built-ins/Date/S15.9.3.1_A6_T4.js
index 14c8137a55eb686dbd59af7fbbb30353817cfd5a..b8985e83d7052ac40ba75b8cf5cbf107f58396a2 100644
--- a/test/built-ins/Date/S15.9.3.1_A6_T4.js
+++ b/test/built-ins/Date/S15.9.3.1_A6_T4.js
@@ -7,7 +7,6 @@ info: >
     with supplied "undefined" argument should be NaN
 es5id: 15.9.3.1_A6_T4
 description: 5 arguments, (year, month, date, hours, minutes)
-includes: [$FAIL.js]
 ---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
@@ -15,49 +14,49 @@ function DateValue(year, month, date, hours, minutes, seconds, ms){
 }
 
 if (!isNaN(DateValue(1899, 11, 31, 23, 59))) {
-  $FAIL("#1: The value should be NaN");
+  $ERROR("#1: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1899, 12, 1, 0, 0))) {
-  $FAIL("#2: The value should be NaN");
+  $ERROR("#2: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1900, 0, 1, 0, 0))) {
-  $FAIL("#3: The value should be NaN");
+  $ERROR("#3: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 11, 31, 23, 59))) {
-  $FAIL("#4: The value should be NaN");
+  $ERROR("#4: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 12, 1, 0, 0))) {
-  $FAIL("#5: The value should be NaN");
+  $ERROR("#5: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1970, 0, 1, 0, 0))) {
-  $FAIL("#6: The value should be NaN");
+  $ERROR("#6: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 11, 31, 23, 59))) {
-  $FAIL("#7: The value should be NaN");
+  $ERROR("#7: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 12, 1, 0, 0))) {
-  $FAIL("#8: The value should be NaN");
+  $ERROR("#8: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2000, 0, 1, 0, 0))) {
-  $FAIL("#9: The value should be NaN");
+  $ERROR("#9: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 11, 31, 23, 59))) {
-  $FAIL("#10: The value should be NaN");
+  $ERROR("#10: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 12, 1, 0, 0))) {
-  $FAIL("#11: The value should be NaN");
+  $ERROR("#11: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2100, 0, 1, 0, 0))) {
-  $FAIL("#12: The value should be NaN");
+  $ERROR("#12: The value should be NaN");
 }
diff --git a/test/built-ins/Date/S15.9.3.1_A6_T5.js b/test/built-ins/Date/S15.9.3.1_A6_T5.js
index d55d179c377c6ff9a21b533e98801c873e20c5ee..5b55afb7b758657d9447c7418a410d0283677797 100644
--- a/test/built-ins/Date/S15.9.3.1_A6_T5.js
+++ b/test/built-ins/Date/S15.9.3.1_A6_T5.js
@@ -7,7 +7,6 @@ info: >
     with supplied "undefined" argument should be NaN
 es5id: 15.9.3.1_A6_T5
 description: 6 arguments, (year, month, date, hours, minutes, seconds)
-includes: [$FAIL.js]
 ---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
@@ -15,49 +14,49 @@ function DateValue(year, month, date, hours, minutes, seconds, ms){
 }
 
 if (!isNaN(DateValue(1899, 11, 31, 23, 59, 59))) {
-  $FAIL("#1: The value should be NaN");
+  $ERROR("#1: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1899, 12, 1, 0, 0, 0))) {
-  $FAIL("#2: The value should be NaN");
+  $ERROR("#2: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1900, 0, 1, 0, 0, 0))) {
-  $FAIL("#3: The value should be NaN");
+  $ERROR("#3: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 11, 31, 23, 59, 59))) {
-  $FAIL("#4: The value should be NaN");
+  $ERROR("#4: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1969, 12, 1, 0, 0, 0))) {
-  $FAIL("#5: The value should be NaN");
+  $ERROR("#5: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1970, 0, 1, 0, 0, 0))) {
-  $FAIL("#6: The value should be NaN");
+  $ERROR("#6: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 11, 31, 23, 59, 59))) {
-  $FAIL("#7: The value should be NaN");
+  $ERROR("#7: The value should be NaN");
 }
 
 if (!isNaN(DateValue(1999, 12, 1, 0, 0, 0))) {
-  $FAIL("#8: The value should be NaN");
+  $ERROR("#8: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2000, 0, 1, 0, 0, 0))) {
-  $FAIL("#9: The value should be NaN");
+  $ERROR("#9: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 11, 31, 23, 59, 59))) {
-  $FAIL("#10: The value should be NaN");
+  $ERROR("#10: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2099, 12, 1, 0, 0, 0))) {
-  $FAIL("#11: The value should be NaN");
+  $ERROR("#11: The value should be NaN");
 }
 
 if (!isNaN(DateValue(2100, 0, 1, 0, 0, 0))) {
-  $FAIL("#12: The value should be NaN");
+  $ERROR("#12: The value should be NaN");
 }
diff --git a/test/built-ins/Date/S15.9.3.2_A1_T1.js b/test/built-ins/Date/S15.9.3.2_A1_T1.js
index 5c0e1e1463a594afa3cb0caa2487198c811edc1d..88066187c80856bbaccd3b34e87d2fee912265ed 100644
--- a/test/built-ins/Date/S15.9.3.2_A1_T1.js
+++ b/test/built-ins/Date/S15.9.3.2_A1_T1.js
@@ -8,150 +8,149 @@ info: >
 es5id: 15.9.3.2_A1_T1
 description: Checking types of newly created objects and it values
 includes:
-    - $FAIL.js
     - Date_constants.js
 ---*/
 
 if (typeof new Date(date_1899_end) !== "object") {
-  $FAIL("#1.1: typeof new Date(date_1899_end) === 'object'");
+  $ERROR("#1.1: typeof new Date(date_1899_end) === 'object'");
 }
 
 if (new Date(date_1899_end) === undefined) {
-  $FAIL("#1.2: new Date(date_1899_end) === undefined");
+  $ERROR("#1.2: new Date(date_1899_end) === undefined");
 }
 
 var x13 = new Date(date_1899_end);
 if(typeof x13 !== "object"){
-  $FAIL("#1.3: typeof new Date(date_1899_end) !== 'object'");
+  $ERROR("#1.3: typeof new Date(date_1899_end) !== 'object'");
 }
 
 var x14 = new Date(date_1899_end);
 if(x14 === undefined){
-  $FAIL("#1.4: new Date(date_1899_end) !== undefined");
+  $ERROR("#1.4: new Date(date_1899_end) !== undefined");
 }
 
 if (typeof new Date(date_1900_start) !== "object") {
-  $FAIL("#2.1: typeof new Date(date_1900_start) === 'object'");
+  $ERROR("#2.1: typeof new Date(date_1900_start) === 'object'");
 }
 
 if (new Date(date_1900_start) === undefined) {
-  $FAIL("#2.2: new Date(date_1900_start) === undefined");
+  $ERROR("#2.2: new Date(date_1900_start) === undefined");
 }
 
 var x23 = new Date(date_1900_start);
 if(typeof x23 !== "object"){
-  $FAIL("#2.3: typeof new Date(date_1900_start) !== 'object'");
+  $ERROR("#2.3: typeof new Date(date_1900_start) !== 'object'");
 }
 
 var x24 = new Date(date_1900_start);
 if(x24 === undefined){
-  $FAIL("#2.4: new Date(date_1900_start) !== undefined");
+  $ERROR("#2.4: new Date(date_1900_start) !== undefined");
 }
 
 if (typeof new Date(date_1969_end) !== "object") {
-  $FAIL("#3.1: typeof new Date(date_1969_end) === 'object'");
+  $ERROR("#3.1: typeof new Date(date_1969_end) === 'object'");
 }
 
 if (new Date(date_1969_end) === undefined) {
-  $FAIL("#3.2: new Date(date_1969_end) === undefined");
+  $ERROR("#3.2: new Date(date_1969_end) === undefined");
 }
 
 var x33 = new Date(date_1969_end);
 if(typeof x33 !== "object"){
-  $FAIL("#3.3: typeof new Date(date_1969_end) !== 'object'");
+  $ERROR("#3.3: typeof new Date(date_1969_end) !== 'object'");
 }
 
 var x34 = new Date(date_1969_end);
 if(x34 === undefined){
-  $FAIL("#3.4: new Date(date_1969_end) !== undefined");
+  $ERROR("#3.4: new Date(date_1969_end) !== undefined");
 }
 
 if (typeof new Date(date_1970_start) !== "object") {
-  $FAIL("#4.1: typeof new Date(date_1970_start) === 'object'");
+  $ERROR("#4.1: typeof new Date(date_1970_start) === 'object'");
 }
 
 if (new Date(date_1970_start) === undefined) {
-  $FAIL("#4.2: new Date(date_1970_start) === undefined");
+  $ERROR("#4.2: new Date(date_1970_start) === undefined");
 }
 
 var x43 = new Date(date_1970_start);
 if(typeof x43 !== "object"){
-  $FAIL("#4.3: typeof new Date(date_1970_start) !== 'object'");
+  $ERROR("#4.3: typeof new Date(date_1970_start) !== 'object'");
 }
 
 var x44 = new Date(date_1970_start);
 if(x44 === undefined){
-  $FAIL("#4.4: new Date(date_1970_start) !== undefined");
+  $ERROR("#4.4: new Date(date_1970_start) !== undefined");
 }
 
 if (typeof new Date(date_1999_end) !== "object") {
-  $FAIL("#5.1: typeof new Date(date_1999_end) === 'object'");
+  $ERROR("#5.1: typeof new Date(date_1999_end) === 'object'");
 }
 
 if (new Date(date_1999_end) === undefined) {
-  $FAIL("#5.2: new Date(date_1999_end) === undefined");
+  $ERROR("#5.2: new Date(date_1999_end) === undefined");
 }
 
 var x53 = new Date(date_1999_end);
 if(typeof x53 !== "object"){
-  $FAIL("#5.3: typeof new Date(date_1999_end) !== 'object'");
+  $ERROR("#5.3: typeof new Date(date_1999_end) !== 'object'");
 }
 
 var x54 = new Date(date_1999_end);
 if(x54 === undefined){
-  $FAIL("#5.4: new Date(date_1999_end) !== undefined");
+  $ERROR("#5.4: new Date(date_1999_end) !== undefined");
 }
 
 if (typeof new Date(date_2000_start) !== "object") {
-  $FAIL("#6.1: typeof new Date(date_2000_start) === 'object'");
+  $ERROR("#6.1: typeof new Date(date_2000_start) === 'object'");
 }
 
 if (new Date(date_2000_start) === undefined) {
-  $FAIL("#6.2: new Date(date_2000_start) === undefined");
+  $ERROR("#6.2: new Date(date_2000_start) === undefined");
 }
 
 var x63 = new Date(date_2000_start);
 if(typeof x63 !== "object"){
-  $FAIL("#6.3: typeof new Date(date_2000_start) !== 'object'");
+  $ERROR("#6.3: typeof new Date(date_2000_start) !== 'object'");
 }
 
 var x64 = new Date(date_2000_start);
 if(x64 === undefined){
-  $FAIL("#6.4: new Date(date_2000_start) !== undefined");
+  $ERROR("#6.4: new Date(date_2000_start) !== undefined");
 }
 
 if (typeof new Date(date_2099_end) !== "object") {
-  $FAIL("#7.1: typeof new Date(date_2099_end) === 'object'");
+  $ERROR("#7.1: typeof new Date(date_2099_end) === 'object'");
 }
 
 if (new Date(date_2099_end) === undefined) {
-  $FAIL("#7.2: new Date(date_2099_end) === undefined");
+  $ERROR("#7.2: new Date(date_2099_end) === undefined");
 }
 
 var x73 = new Date(date_2099_end);
 if(typeof x73 !== "object"){
-  $FAIL("#7.3: typeof new Date(date_2099_end) !== 'object'");
+  $ERROR("#7.3: typeof new Date(date_2099_end) !== 'object'");
 }
 
 var x74 = new Date(date_2099_end);
 if(x74 === undefined){
-  $FAIL("#7.4: new Date(date_2099_end) !== undefined");
+  $ERROR("#7.4: new Date(date_2099_end) !== undefined");
 }
 
 if (typeof new Date(date_2100_start) !== "object") {
-  $FAIL("#8.1: typeof new Date(date_2100_start) === 'object'");
+  $ERROR("#8.1: typeof new Date(date_2100_start) === 'object'");
 }
 
 if (new Date(date_2100_start) === undefined) {
-  $FAIL("#8.2: new Date(date_2100_start) === undefined");
+  $ERROR("#8.2: new Date(date_2100_start) === undefined");
 }
 
 var x83 = new Date(date_2100_start);
 if(typeof x83 !== "object"){
-  $FAIL("#8.3: typeof new Date(date_2100_start) !== 'object'");
+  $ERROR("#8.3: typeof new Date(date_2100_start) !== 'object'");
 }
 
 var x84 = new Date(date_2100_start);
 if(x84 === undefined){
-  $FAIL("#8.4: new Date(date_2100_start) !== undefined");
+  $ERROR("#8.4: new Date(date_2100_start) !== undefined");
 }
diff --git a/test/built-ins/Date/S15.9.3.2_A2_T1.js b/test/built-ins/Date/S15.9.3.2_A2_T1.js
index 458bacabc5ca7127f24a1bfeaf21bdd8c261b59d..1312cb05fd9d1583b1cc658d373d30cfe963d179 100644
--- a/test/built-ins/Date/S15.9.3.2_A2_T1.js
+++ b/test/built-ins/Date/S15.9.3.2_A2_T1.js
@@ -9,13 +9,12 @@ info: >
 es5id: 15.9.3.2_A2_T1
 description: Checking Date.prototype property of newly constructed objects
 includes:
-    - $FAIL.js
     - Date_constants.js
 ---*/
 
 var x11 = new Date(date_1899_end);
 if (typeof x11.constructor.prototype !== "object") {
-  $FAIL("#1.1: typeof x11.constructor.prototype === 'object'");
+  $ERROR("#1.1: typeof x11.constructor.prototype === 'object'");
 }
 
 var x12 = new Date(date_1899_end);
@@ -25,12 +24,12 @@ if (!Date.prototype.isPrototypeOf(x12)) {
 
 var x13 = new Date(date_1899_end);
 if(Date.prototype !== x13.constructor.prototype){
-  $FAIL("#1.3: Date.prototype !== x13.constructor.prototype");
+  $ERROR("#1.3: Date.prototype !== x13.constructor.prototype");
 }
 
 var x21 = new Date(date_1900_start);
 if (typeof x21.constructor.prototype !== "object") {
-  $FAIL("#2.1: typeof x21.constructor.prototype === 'object'");
+  $ERROR("#2.1: typeof x21.constructor.prototype === 'object'");
 }
 
 var x22 = new Date(date_1900_start);
@@ -40,12 +39,12 @@ if (!Date.prototype.isPrototypeOf(x22)) {
 
 var x23 = new Date(date_1900_start);
 if(Date.prototype !== x23.constructor.prototype){
-  $FAIL("#2.3: Date.prototype !== x23.constructor.prototype");
+  $ERROR("#2.3: Date.prototype !== x23.constructor.prototype");
 }
 
 var x31 = new Date(date_1969_end);
 if (typeof x31.constructor.prototype !== "object") {
-  $FAIL("#3.1: typeof x31.constructor.prototype === 'object'");
+  $ERROR("#3.1: typeof x31.constructor.prototype === 'object'");
 }
 
 var x32 = new Date(date_1969_end);
@@ -55,12 +54,12 @@ if (!Date.prototype.isPrototypeOf(x32)) {
 
 var x33 = new Date(date_1969_end);
 if(Date.prototype !== x33.constructor.prototype){
-  $FAIL("#3.3: Date.prototype !== x33.constructor.prototype");
+  $ERROR("#3.3: Date.prototype !== x33.constructor.prototype");
 }
 
 var x41 = new Date(date_1970_start);
 if (typeof x41.constructor.prototype !== "object") {
-  $FAIL("#4.1: typeof x11.constructor.prototype === 'object'");
+  $ERROR("#4.1: typeof x11.constructor.prototype === 'object'");
 }
 
 var x42 = new Date(date_1970_start);
@@ -70,12 +69,12 @@ if (!Date.prototype.isPrototypeOf(x42)) {
 
 var x43 = new Date(date_1970_start);
 if(Date.prototype !== x43.constructor.prototype){
-  $FAIL("#4.3: Date.prototype !== x43.constructor.prototype");
+  $ERROR("#4.3: Date.prototype !== x43.constructor.prototype");
 }
 
 var x51 = new Date(date_1999_end);
 if (typeof x51.constructor.prototype !== "object") {
-  $FAIL("#5.1: typeof x51.constructor.prototype === 'object'");
+  $ERROR("#5.1: typeof x51.constructor.prototype === 'object'");
 }
 
 var x52 = new Date(date_1999_end);
@@ -85,12 +84,12 @@ if (!Date.prototype.isPrototypeOf(x52)) {
 
 var x53 = new Date(date_1999_end);
 if(Date.prototype !== x53.constructor.prototype){
-  $FAIL("#5.3: Date.prototype !== x53.constructor.prototype");
+  $ERROR("#5.3: Date.prototype !== x53.constructor.prototype");
 }
 
 var x61 = new Date(date_2000_start);
 if (typeof x61.constructor.prototype !== "object") {
-  $FAIL("#6.1: typeof x61.constructor.prototype === 'object'");
+  $ERROR("#6.1: typeof x61.constructor.prototype === 'object'");
 }
 
 var x62 = new Date(date_2000_start);
@@ -100,12 +99,12 @@ if (!Date.prototype.isPrototypeOf(x62)) {
 
 var x63 = new Date(date_2000_start);
 if(Date.prototype !== x63.constructor.prototype){
-  $FAIL("#6.3: Date.prototype !== x63.constructor.prototype");
+  $ERROR("#6.3: Date.prototype !== x63.constructor.prototype");
 }
 
 var x71 = new Date(date_2099_end);
 if (typeof x71.constructor.prototype !== "object") {
-  $FAIL("#7.1: typeof x71.constructor.prototype === 'object'");
+  $ERROR("#7.1: typeof x71.constructor.prototype === 'object'");
 }
 
 var x72 = new Date(date_2099_end);
@@ -115,12 +114,12 @@ if (!Date.prototype.isPrototypeOf(x72)) {
 
 var x73 = new Date(date_2099_end);
 if(Date.prototype !== x73.constructor.prototype){
-  $FAIL("#7.3: Date.prototype !== x73.constructor.prototype");
+  $ERROR("#7.3: Date.prototype !== x73.constructor.prototype");
 }
 
 var x81 = new Date(date_2100_start);
 if (typeof x81.constructor.prototype !== "object") {
-  $FAIL("#8.1: typeof x81.constructor.prototype === 'object'");
+  $ERROR("#8.1: typeof x81.constructor.prototype === 'object'");
 }
 
 var x82 = new Date(date_2100_start);
@@ -130,5 +129,5 @@ if (!Date.prototype.isPrototypeOf(x82)) {
 
 var x83 = new Date(date_2100_start);
 if(Date.prototype !== x83.constructor.prototype){
-  $FAIL("#8.3: Date.prototype !== x83.constructor.prototype");
+  $ERROR("#8.3: Date.prototype !== x83.constructor.prototype");
 }
diff --git a/test/built-ins/Date/S15.9.3.2_A3_T1.1.js b/test/built-ins/Date/S15.9.3.2_A3_T1.1.js
index a3b61e44cd3f93f862cadbe90099ff07da27c629..2cf740fd27218c53cc6554c7ed877b3f7de96635 100644
--- a/test/built-ins/Date/S15.9.3.2_A3_T1.1.js
+++ b/test/built-ins/Date/S15.9.3.2_A3_T1.1.js
@@ -8,46 +8,45 @@ info: >
 es5id: 15.9.3.2_A3_T1.1
 description: Test based on delete prototype.toString
 includes:
-    - $FAIL.js
     - Date_constants.js
 ---*/
 
 var x1 = new Date(date_1899_end);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(date_1900_start);
 if (Object.prototype.toString.call(x2) !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(date_1969_end);
 if (Object.prototype.toString.call(x3) !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(date_1970_start);
 if (Object.prototype.toString.call(x4) !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(date_1999_end);
 if (Object.prototype.toString.call(x5) !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(date_2000_start);
 if (Object.prototype.toString.call(x6) !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(date_2099_end);
 if (Object.prototype.toString.call(x7) !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(date_2100_start);
 if (Object.prototype.toString.call(x8) !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/S15.9.3.2_A3_T1.2.js b/test/built-ins/Date/S15.9.3.2_A3_T1.2.js
index 171719b0030e961a48a5364b087e99f63a755b61..a12598c7afa441f7f24a39718378f0f74c07effd 100644
--- a/test/built-ins/Date/S15.9.3.2_A3_T1.2.js
+++ b/test/built-ins/Date/S15.9.3.2_A3_T1.2.js
@@ -8,7 +8,6 @@ info: >
 es5id: 15.9.3.2_A3_T1.2
 description: Test based on overwriting prototype.toString
 includes:
-    - $FAIL.js
     - Date_constants.js
 ---*/
 
@@ -16,40 +15,40 @@ Date.prototype.toString = Object.prototype.toString;
 
 var x1 = new Date(date_1899_end);
 if (x1.toString() !== "[object Date]") {
-  $FAIL("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#1: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x2 = new Date(date_1900_start);
 if (x2.toString() !== "[object Date]") {
-  $FAIL("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#2: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x3 = new Date(date_1969_end);
 if (x3.toString() !== "[object Date]") {
-  $FAIL("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#3: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x4 = new Date(date_1970_start);
 if (x4.toString() !== "[object Date]") {
-  $FAIL("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#4: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x5 = new Date(date_1999_end);
 if (x5.toString() !== "[object Date]") {
-  $FAIL("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#5: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x6 = new Date(date_2000_start);
 if (x6.toString() !== "[object Date]") {
-  $FAIL("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#6: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x7 = new Date(date_2099_end);
 if (x7.toString() !== "[object Date]") {
-  $FAIL("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#7: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
 
 var x8 = new Date(date_2100_start);
 if (x8.toString() !== "[object Date]") {
-  $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
+  $ERROR("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
diff --git a/test/built-ins/Date/UTC/S15.9.4.3_A1_T2.js b/test/built-ins/Date/UTC/S15.9.4.3_A1_T2.js
index 3775283b1fcad1123fe5d424eb122f4fc44562e7..baa126a547ac46476129c5aacaa3fb5ae07e745f 100644
--- a/test/built-ins/Date/UTC/S15.9.4.3_A1_T2.js
+++ b/test/built-ins/Date/UTC/S15.9.4.3_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date property "UTC" has { DontEnum } attributes
 es5id: 15.9.4.3_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.UTC  === false) {
@@ -13,5 +12,5 @@ if (delete Date.UTC  === false) {
 }
 
 if (Date.hasOwnProperty('UTC')) {
-  $FAIL('#2: The Date.UTC property has not the attributes DontDelete');
+  $ERROR('#2: The Date.UTC property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/UTC/S15.9.4.3_A3_T2.js b/test/built-ins/Date/UTC/S15.9.4.3_A3_T2.js
index b2b705b362065c815fcccf7db8b1612e7801ccfd..ef8352e2afc455e7eb39f6ee0df548704e5f16b2 100644
--- a/test/built-ins/Date/UTC/S15.9.4.3_A3_T2.js
+++ b/test/built-ins/Date/UTC/S15.9.4.3_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     attributes
 es5id: 15.9.4.3_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.UTC.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.UTC.length  !== true) {
 }
 
 if (Date.UTC.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.UTC.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.UTC.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/parse/S15.9.4.2_A1_T2.js b/test/built-ins/Date/parse/S15.9.4.2_A1_T2.js
index a6dae5286c7e18ea2bce3c3260fbc847c0379096..5c9bb6a071ce6db20d1dd2beb07b19bf0447e00d 100644
--- a/test/built-ins/Date/parse/S15.9.4.2_A1_T2.js
+++ b/test/built-ins/Date/parse/S15.9.4.2_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date property "parse" has { DontEnum } attributes
 es5id: 15.9.4.2_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.parse  === false) {
@@ -13,5 +12,5 @@ if (delete Date.parse  === false) {
 }
 
 if (Date.hasOwnProperty('parse')) {
-  $FAIL('#2: The Date.parse property has not the attributes DontDelete');
+  $ERROR('#2: The Date.parse property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/parse/S15.9.4.2_A3_T2.js b/test/built-ins/Date/parse/S15.9.4.2_A3_T2.js
index 672a83baff7fc35d1ae38c8d86f21d37195cb19f..e423cb6a128dfac542f5d6cb5131a636fdf74dd9 100644
--- a/test/built-ins/Date/parse/S15.9.4.2_A3_T2.js
+++ b/test/built-ins/Date/parse/S15.9.4.2_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     attributes
 es5id: 15.9.4.2_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.parse.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.parse.length  !== true) {
 }
 
 if (Date.parse.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.parse.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.parse.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/S15.9.4.1_A1_T2.js b/test/built-ins/Date/prototype/S15.9.4.1_A1_T2.js
index bcca9c2ca792f6ea3063e8f8c5485550256e1a2d..0fe496b4a1ede02f5968d5978f3fc9e6e8e840b8 100644
--- a/test/built-ins/Date/prototype/S15.9.4.1_A1_T2.js
+++ b/test/built-ins/Date/prototype/S15.9.4.1_A1_T2.js
@@ -22,5 +22,5 @@ try {
 }
 
 if (!Date.hasOwnProperty('prototype')) {
-  $FAIL('#2: The Date.prototype property has the attributes DontDelete');
+  $ERROR('#2: The Date.prototype property has the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/constructor/S15.9.5.1_A1_T2.js b/test/built-ins/Date/prototype/constructor/S15.9.5.1_A1_T2.js
index 313f004648bc860659b1d089c722364b867ede36..9c93f115d3657e080869720d9a7a55378d9555e4 100644
--- a/test/built-ins/Date/prototype/constructor/S15.9.5.1_A1_T2.js
+++ b/test/built-ins/Date/prototype/constructor/S15.9.5.1_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "constructor" has { DontEnum } attributes
 es5id: 15.9.5.1_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.constructor  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.constructor  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('constructor')) {
-  $FAIL('#2: The Date.prototype.constructor property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.constructor property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/constructor/S15.9.5.1_A3_T2.js b/test/built-ins/Date/prototype/constructor/S15.9.5.1_A3_T2.js
index bd3a007b4ad4055316a238a97e93bb43d95c4a37..c28c9b48d672880859c36c427c0c7374e50899f4 100644
--- a/test/built-ins/Date/prototype/constructor/S15.9.5.1_A3_T2.js
+++ b/test/built-ins/Date/prototype/constructor/S15.9.5.1_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.1_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.constructor.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.constructor.length  !== true) {
 }
 
 if (Date.prototype.constructor.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.constructor.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.constructor.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getDate/S15.9.5.14_A1_T2.js b/test/built-ins/Date/prototype/getDate/S15.9.5.14_A1_T2.js
index 3f793f4bbe8c17b323419eff5d75fbcb855444a1..99c84b1e28cafc0b2539d49eb257f7cb8a01143b 100644
--- a/test/built-ins/Date/prototype/getDate/S15.9.5.14_A1_T2.js
+++ b/test/built-ins/Date/prototype/getDate/S15.9.5.14_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getDate" has { DontEnum } attributes
 es5id: 15.9.5.14_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getDate  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getDate  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getDate')) {
-  $FAIL('#2: The Date.prototype.getDate property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getDate property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getDate/S15.9.5.14_A3_T2.js b/test/built-ins/Date/prototype/getDate/S15.9.5.14_A3_T2.js
index 339ac47c2b19385422a4cd50c2eed779c65791a3..4f81fd3fc185903fb169fceeba0308d2416e0395 100644
--- a/test/built-ins/Date/prototype/getDate/S15.9.5.14_A3_T2.js
+++ b/test/built-ins/Date/prototype/getDate/S15.9.5.14_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.14_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getDate.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getDate.length  !== true) {
 }
 
 if (Date.prototype.getDate.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getDate.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getDate.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getDay/S15.9.5.16_A1_T2.js b/test/built-ins/Date/prototype/getDay/S15.9.5.16_A1_T2.js
index ea1e89cd4230a31890d0001fa9a7c01c60205050..61df50bfda946612b3d078f67dc03728e83cff3c 100644
--- a/test/built-ins/Date/prototype/getDay/S15.9.5.16_A1_T2.js
+++ b/test/built-ins/Date/prototype/getDay/S15.9.5.16_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getDay" has { DontEnum } attributes
 es5id: 15.9.5.16_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getDay  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getDay  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getDay')) {
-  $FAIL('#2: The Date.prototype.getDay property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getDay property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getDay/S15.9.5.16_A3_T2.js b/test/built-ins/Date/prototype/getDay/S15.9.5.16_A3_T2.js
index 0400a9a25ba1ba826f20b66bad824c4268a74eb4..28076b7459055d319cab2df2bbdd49cbb92cdbce 100644
--- a/test/built-ins/Date/prototype/getDay/S15.9.5.16_A3_T2.js
+++ b/test/built-ins/Date/prototype/getDay/S15.9.5.16_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontEnum } attributes
 es5id: 15.9.5.16_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getDay.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getDay.length  !== true) {
 }
 
 if (Date.prototype.getDay.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getDay.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getDay.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getFullYear/S15.9.5.10_A1_T2.js b/test/built-ins/Date/prototype/getFullYear/S15.9.5.10_A1_T2.js
index 0624b7978aeffbb87f7e4828ed371ecfe9231740..970f15c14301d1652cc6bba4f3b49fda81ae08dd 100644
--- a/test/built-ins/Date/prototype/getFullYear/S15.9.5.10_A1_T2.js
+++ b/test/built-ins/Date/prototype/getFullYear/S15.9.5.10_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getFullYear" has { DontEnum } attributes
 es5id: 15.9.5.10_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getFullYear  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getFullYear  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getFullYear')) {
-  $FAIL('#2: The Date.prototype.getFullYear property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getFullYear property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getFullYear/S15.9.5.10_A3_T2.js b/test/built-ins/Date/prototype/getFullYear/S15.9.5.10_A3_T2.js
index c67a54531ff4732beedded5df64043fa79eea0f1..5b3256f352f7f7dc1b83e4004ed47e0d07ef22c1 100644
--- a/test/built-ins/Date/prototype/getFullYear/S15.9.5.10_A3_T2.js
+++ b/test/built-ins/Date/prototype/getFullYear/S15.9.5.10_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.10_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getFullYear.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getFullYear.length  !== true) {
 }
 
 if (Date.prototype.getFullYear.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getFullYear.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getFullYear.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getHours/S15.9.5.18_A1_T2.js b/test/built-ins/Date/prototype/getHours/S15.9.5.18_A1_T2.js
index fd8d1e6367db694a3cee1836367549849b85d5de..3ed240a570faceb4c0002b90917e8b23d84bb100 100644
--- a/test/built-ins/Date/prototype/getHours/S15.9.5.18_A1_T2.js
+++ b/test/built-ins/Date/prototype/getHours/S15.9.5.18_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getHours" has { DontEnum } attributes
 es5id: 15.9.5.18_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getHours  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getHours  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getHours')) {
-  $FAIL('#2: The Date.prototype.getHours property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getHours property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getHours/S15.9.5.18_A3_T2.js b/test/built-ins/Date/prototype/getHours/S15.9.5.18_A3_T2.js
index fbd9265a4443afffd024c7b09452e31cb3a869e9..e16b6e2016caa14441199132834f3ed46a01b5ff 100644
--- a/test/built-ins/Date/prototype/getHours/S15.9.5.18_A3_T2.js
+++ b/test/built-ins/Date/prototype/getHours/S15.9.5.18_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.18_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getHours.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getHours.length  !== true) {
 }
 
 if (Date.prototype.getHours.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getHours.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getHours.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getMilliseconds/S15.9.5.24_A1_T2.js b/test/built-ins/Date/prototype/getMilliseconds/S15.9.5.24_A1_T2.js
index d53090d63812395ea8ead02235f6d3c2fed1182c..bf9ca3280e4f4de6246a7319996982acbc1cad8e 100644
--- a/test/built-ins/Date/prototype/getMilliseconds/S15.9.5.24_A1_T2.js
+++ b/test/built-ins/Date/prototype/getMilliseconds/S15.9.5.24_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getMilliseconds" has { DontEnum } attributes
 es5id: 15.9.5.24_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getMilliseconds  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getMilliseconds  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getMilliseconds')) {
-  $FAIL('#2: The Date.prototype.getMilliseconds property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getMilliseconds property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getMilliseconds/S15.9.5.24_A3_T2.js b/test/built-ins/Date/prototype/getMilliseconds/S15.9.5.24_A3_T2.js
index d833652f48cb3784b1c6eddfc895bd6da0b83cd2..04feb91f9eba94c48448f11209550883b9fcf803 100644
--- a/test/built-ins/Date/prototype/getMilliseconds/S15.9.5.24_A3_T2.js
+++ b/test/built-ins/Date/prototype/getMilliseconds/S15.9.5.24_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.24_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getMilliseconds.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getMilliseconds.length  !== true) {
 }
 
 if (Date.prototype.getMilliseconds.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getMilliseconds.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getMilliseconds.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getMinutes/S15.9.5.20_A1_T2.js b/test/built-ins/Date/prototype/getMinutes/S15.9.5.20_A1_T2.js
index 8b1fd253bb024f644b1a6672cb1d503694fec033..fdc800345fa33bf0137e37c1a87f93908e473955 100644
--- a/test/built-ins/Date/prototype/getMinutes/S15.9.5.20_A1_T2.js
+++ b/test/built-ins/Date/prototype/getMinutes/S15.9.5.20_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getMinutes" has { DontEnum } attributes
 es5id: 15.9.5.20_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getMinutes  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getMinutes  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getMinutes')) {
-  $FAIL('#2: The Date.prototype.getMinutes property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getMinutes property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getMinutes/S15.9.5.20_A3_T2.js b/test/built-ins/Date/prototype/getMinutes/S15.9.5.20_A3_T2.js
index 064ea8f81bd73cd7c62a75e2418b00f0403fe3fc..41c10d6f00f9aa42c7e2bdf4a7b5756da191661b 100644
--- a/test/built-ins/Date/prototype/getMinutes/S15.9.5.20_A3_T2.js
+++ b/test/built-ins/Date/prototype/getMinutes/S15.9.5.20_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.20_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getMinutes.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getMinutes.length  !== true) {
 }
 
 if (Date.prototype.getMinutes.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getMinutes.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getMinutes.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getMonth/S15.9.5.12_A1_T2.js b/test/built-ins/Date/prototype/getMonth/S15.9.5.12_A1_T2.js
index 554e0eac0685270cf5f0f006c1492345777025a9..6aae7f432af501d5fad34d80e242e472d0432f6b 100644
--- a/test/built-ins/Date/prototype/getMonth/S15.9.5.12_A1_T2.js
+++ b/test/built-ins/Date/prototype/getMonth/S15.9.5.12_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getMonth" has { DontEnum } attributes
 es5id: 15.9.5.12_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getMonth  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getMonth  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getMonth')) {
-  $FAIL('#2: The Date.prototype.getMonth property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getMonth property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getMonth/S15.9.5.12_A3_T2.js b/test/built-ins/Date/prototype/getMonth/S15.9.5.12_A3_T2.js
index 0b8f16ddc35ea43a61ec725bbd402b60764a75da..7f49d40eb86834455561222b9b078c8c07282b9c 100644
--- a/test/built-ins/Date/prototype/getMonth/S15.9.5.12_A3_T2.js
+++ b/test/built-ins/Date/prototype/getMonth/S15.9.5.12_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.12_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getMonth.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getMonth.length  !== true) {
 }
 
 if (Date.prototype.getMonth.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getMonth.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getMonth.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getSeconds/S15.9.5.22_A1_T2.js b/test/built-ins/Date/prototype/getSeconds/S15.9.5.22_A1_T2.js
index 5bcc5179da65c6c6900a2e227b5c6c13a93efda3..2e0496fe6daa8b53985c8cdbab7a6c2300d9b40a 100644
--- a/test/built-ins/Date/prototype/getSeconds/S15.9.5.22_A1_T2.js
+++ b/test/built-ins/Date/prototype/getSeconds/S15.9.5.22_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getSeconds" has { DontEnum } attributes
 es5id: 15.9.5.22_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getSeconds  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getSeconds  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getSeconds')) {
-  $FAIL('#2: The Date.prototype.getSeconds property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getSeconds property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getSeconds/S15.9.5.22_A3_T2.js b/test/built-ins/Date/prototype/getSeconds/S15.9.5.22_A3_T2.js
index 6477272b39ea30855f89cb5e5e350ce6f04fcd21..42a50f75be06f3a288fc438f5bb6fbaf79cbd4df 100644
--- a/test/built-ins/Date/prototype/getSeconds/S15.9.5.22_A3_T2.js
+++ b/test/built-ins/Date/prototype/getSeconds/S15.9.5.22_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.22_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getSeconds.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getSeconds.length  !== true) {
 }
 
 if (Date.prototype.getSeconds.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getSeconds.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getSeconds.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getTime/S15.9.5.9_A1_T2.js b/test/built-ins/Date/prototype/getTime/S15.9.5.9_A1_T2.js
index 3b08891724828d1d620a51a908733275382582b9..40277fbb5bcbf4797ce609794e89cce313145588 100644
--- a/test/built-ins/Date/prototype/getTime/S15.9.5.9_A1_T2.js
+++ b/test/built-ins/Date/prototype/getTime/S15.9.5.9_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getTime" has { DontEnum } attributes
 es5id: 15.9.5.9_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getTime  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getTime  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getTime')) {
-  $FAIL('#2: The Date.prototype.getTime property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getTime property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getTime/S15.9.5.9_A3_T2.js b/test/built-ins/Date/prototype/getTime/S15.9.5.9_A3_T2.js
index 29f714300c7d73d8cb653840bf8b8535fd3f20df..0d674dd8cb875ba8914396b1f8787ea4c5984a0a 100644
--- a/test/built-ins/Date/prototype/getTime/S15.9.5.9_A3_T2.js
+++ b/test/built-ins/Date/prototype/getTime/S15.9.5.9_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.9_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getTime.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getTime.length  !== true) {
 }
 
 if (Date.prototype.getTime.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getTime.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getTime.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getTimezoneOffset/S15.9.5.26_A1_T2.js b/test/built-ins/Date/prototype/getTimezoneOffset/S15.9.5.26_A1_T2.js
index 0fdbad11c03ae85b2f1bf19d43ca94fd43b38739..47c20d4f692546b566e17b59774dec59528d24f0 100644
--- a/test/built-ins/Date/prototype/getTimezoneOffset/S15.9.5.26_A1_T2.js
+++ b/test/built-ins/Date/prototype/getTimezoneOffset/S15.9.5.26_A1_T2.js
@@ -7,7 +7,6 @@ info: >
     attributes
 es5id: 15.9.5.26_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getTimezoneOffset  === false) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getTimezoneOffset  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getTimezoneOffset')) {
-  $FAIL('#2: The Date.prototype.getTimezoneOffset property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getTimezoneOffset property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getTimezoneOffset/S15.9.5.26_A3_T2.js b/test/built-ins/Date/prototype/getTimezoneOffset/S15.9.5.26_A3_T2.js
index 92e4ad15ee0da8158ebbb2bcf6b5a8c162d13cb3..d7f9b16ff151c7fb47010f5005e0dfdf04d05914 100644
--- a/test/built-ins/Date/prototype/getTimezoneOffset/S15.9.5.26_A3_T2.js
+++ b/test/built-ins/Date/prototype/getTimezoneOffset/S15.9.5.26_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.26_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getTimezoneOffset.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getTimezoneOffset.length  !== true) {
 }
 
 if (Date.prototype.getTimezoneOffset.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getTimezoneOffset.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getTimezoneOffset.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCDate/S15.9.5.15_A1_T2.js b/test/built-ins/Date/prototype/getUTCDate/S15.9.5.15_A1_T2.js
index 4a4df3549d982d3c23c4d7727d3db4f13e3e653d..630f2d1e613a37fcd82ae847f033a237735f1215 100644
--- a/test/built-ins/Date/prototype/getUTCDate/S15.9.5.15_A1_T2.js
+++ b/test/built-ins/Date/prototype/getUTCDate/S15.9.5.15_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getUTCDate" has { DontEnum } attributes
 es5id: 15.9.5.15_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCDate  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getUTCDate  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getUTCDate')) {
-  $FAIL('#2: The Date.prototype.getUTCDate property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCDate property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCDate/S15.9.5.15_A3_T2.js b/test/built-ins/Date/prototype/getUTCDate/S15.9.5.15_A3_T2.js
index 722eb61320b6572056d282e0e6fd197dff2026fe..912c9c4a628aa8d30fec1e5942fe7532fbe40dd0 100644
--- a/test/built-ins/Date/prototype/getUTCDate/S15.9.5.15_A3_T2.js
+++ b/test/built-ins/Date/prototype/getUTCDate/S15.9.5.15_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.15_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCDate.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getUTCDate.length  !== true) {
 }
 
 if (Date.prototype.getUTCDate.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getUTCDate.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCDate.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCDay/S15.9.5.17_A1_T2.js b/test/built-ins/Date/prototype/getUTCDay/S15.9.5.17_A1_T2.js
index ee88f27247a7f937a527893425d5015aeba466f4..51262054687a432183f09a7ee86f14197a47f516 100644
--- a/test/built-ins/Date/prototype/getUTCDay/S15.9.5.17_A1_T2.js
+++ b/test/built-ins/Date/prototype/getUTCDay/S15.9.5.17_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getUTCDay" has { DontEnum } attributes
 es5id: 15.9.5.17_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCDay  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getUTCDay  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getUTCDay')) {
-  $FAIL('#2: The Date.prototype.getUTCDay property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCDay property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCDay/S15.9.5.17_A3_T2.js b/test/built-ins/Date/prototype/getUTCDay/S15.9.5.17_A3_T2.js
index 65ae79f935ee24f178afd93fd3438a12481c20fe..ad97a74fd2c12fa25d8ce7fe8444336278ad84db 100644
--- a/test/built-ins/Date/prototype/getUTCDay/S15.9.5.17_A3_T2.js
+++ b/test/built-ins/Date/prototype/getUTCDay/S15.9.5.17_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.17_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCDay.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getUTCDay.length  !== true) {
 }
 
 if (Date.prototype.getUTCDay.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getUTCDay.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCDay.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCFullYear/S15.9.5.11_A1_T2.js b/test/built-ins/Date/prototype/getUTCFullYear/S15.9.5.11_A1_T2.js
index 28dc28cbb9058158416a748467f1de9e846bedb0..f649326b1e82bccc7bf2676762a2c173922872d0 100644
--- a/test/built-ins/Date/prototype/getUTCFullYear/S15.9.5.11_A1_T2.js
+++ b/test/built-ins/Date/prototype/getUTCFullYear/S15.9.5.11_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getUTCFullYear" has { DontEnum } attributes
 es5id: 15.9.5.11_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCFullYear  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getUTCFullYear  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getUTCFullYear')) {
-  $FAIL('#2: The Date.prototype.getUTCFullYear property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCFullYear property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCFullYear/S15.9.5.11_A3_T2.js b/test/built-ins/Date/prototype/getUTCFullYear/S15.9.5.11_A3_T2.js
index bc85f9486a0cc4ad88884d70198610015ff501e8..7491cc120a0718cd0d3a2855dc9eae5bf85c498a 100644
--- a/test/built-ins/Date/prototype/getUTCFullYear/S15.9.5.11_A3_T2.js
+++ b/test/built-ins/Date/prototype/getUTCFullYear/S15.9.5.11_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.11_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCFullYear.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getUTCFullYear.length  !== true) {
 }
 
 if (Date.prototype.getUTCFullYear.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getUTCFullYear.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCFullYear.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCHours/S15.9.5.19_A1_T2.js b/test/built-ins/Date/prototype/getUTCHours/S15.9.5.19_A1_T2.js
index eda9f70c458e12f4656ea6d7ce9e7347ac9778cc..896adde36c324bfa316a78dd9c18fb554cdbba94 100644
--- a/test/built-ins/Date/prototype/getUTCHours/S15.9.5.19_A1_T2.js
+++ b/test/built-ins/Date/prototype/getUTCHours/S15.9.5.19_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getUTCHours" has { DontEnum } attributes
 es5id: 15.9.5.19_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCHours  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getUTCHours  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getUTCHours')) {
-  $FAIL('#2: The Date.prototype.getUTCHours property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCHours property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCHours/S15.9.5.19_A3_T2.js b/test/built-ins/Date/prototype/getUTCHours/S15.9.5.19_A3_T2.js
index e850716e7d3f92b7b61da803a3e0163543c5204e..cb53754fc9a1b7e4c70a4aef326b5948df03dcf5 100644
--- a/test/built-ins/Date/prototype/getUTCHours/S15.9.5.19_A3_T2.js
+++ b/test/built-ins/Date/prototype/getUTCHours/S15.9.5.19_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.19_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCHours.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getUTCHours.length  !== true) {
 }
 
 if (Date.prototype.getUTCHours.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getUTCHours.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCHours.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCMilliseconds/S15.9.5.25_A1_T2.js b/test/built-ins/Date/prototype/getUTCMilliseconds/S15.9.5.25_A1_T2.js
index 588f72305098a01c01b89225555c4afbdd7e96f5..817c8b93eede78e34056d4ad27fe97da50fe17a0 100644
--- a/test/built-ins/Date/prototype/getUTCMilliseconds/S15.9.5.25_A1_T2.js
+++ b/test/built-ins/Date/prototype/getUTCMilliseconds/S15.9.5.25_A1_T2.js
@@ -7,7 +7,6 @@ info: >
     attributes
 es5id: 15.9.5.25_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCMilliseconds  === false) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getUTCMilliseconds  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getUTCMilliseconds')) {
-  $FAIL('#2: The Date.prototype.getUTCMilliseconds property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCMilliseconds property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCMilliseconds/S15.9.5.25_A3_T2.js b/test/built-ins/Date/prototype/getUTCMilliseconds/S15.9.5.25_A3_T2.js
index 5b1608e11fda4f8059877cbf1e2107f5393642c4..5de8b6ef6857a377a10c685af158866138f93328 100644
--- a/test/built-ins/Date/prototype/getUTCMilliseconds/S15.9.5.25_A3_T2.js
+++ b/test/built-ins/Date/prototype/getUTCMilliseconds/S15.9.5.25_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.25_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCMilliseconds.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getUTCMilliseconds.length  !== true) {
 }
 
 if (Date.prototype.getUTCMilliseconds.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getUTCMilliseconds.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCMilliseconds.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCMinutes/S15.9.5.21_A1_T2.js b/test/built-ins/Date/prototype/getUTCMinutes/S15.9.5.21_A1_T2.js
index 047b64b3e52b52d212fad9ff0c3c87d094a71149..0eee47f6c6ad8300fa90acdb977305b1c340949f 100644
--- a/test/built-ins/Date/prototype/getUTCMinutes/S15.9.5.21_A1_T2.js
+++ b/test/built-ins/Date/prototype/getUTCMinutes/S15.9.5.21_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getUTCMinutes" has { DontEnum } attributes
 es5id: 15.9.5.21_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCMinutes  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getUTCMinutes  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getUTCMinutes')) {
-  $FAIL('#2: The Date.prototype.getUTCMinutes property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCMinutes property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCMinutes/S15.9.5.21_A3_T2.js b/test/built-ins/Date/prototype/getUTCMinutes/S15.9.5.21_A3_T2.js
index a7806830bd2b83163fdd2a775500578c6ba871a3..3e3127ab403b9ea0af19446ba1fffe43773df12d 100644
--- a/test/built-ins/Date/prototype/getUTCMinutes/S15.9.5.21_A3_T2.js
+++ b/test/built-ins/Date/prototype/getUTCMinutes/S15.9.5.21_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.21_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCMinutes.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getUTCMinutes.length  !== true) {
 }
 
 if (Date.prototype.getUTCMinutes.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getUTCMinutes.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCMinutes.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCMonth/S15.9.5.13_A1_T2.js b/test/built-ins/Date/prototype/getUTCMonth/S15.9.5.13_A1_T2.js
index 5d0995120e660a236206733634348090b7214921..96bde6ccbe93a3ab8b0df03dc3c65f1bca7cbc2c 100644
--- a/test/built-ins/Date/prototype/getUTCMonth/S15.9.5.13_A1_T2.js
+++ b/test/built-ins/Date/prototype/getUTCMonth/S15.9.5.13_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getUTCMonth" has { DontEnum } attributes
 es5id: 15.9.5.13_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCMonth  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getUTCMonth  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getUTCMonth')) {
-  $FAIL('#2: The Date.prototype.getUTCMonth property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCMonth property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCMonth/S15.9.5.13_A3_T2.js b/test/built-ins/Date/prototype/getUTCMonth/S15.9.5.13_A3_T2.js
index 03923b56e9e9230c56682ff38a8bd1b2bd95eb77..6b0682777777cc908e178292e1ff971e31531b05 100644
--- a/test/built-ins/Date/prototype/getUTCMonth/S15.9.5.13_A3_T2.js
+++ b/test/built-ins/Date/prototype/getUTCMonth/S15.9.5.13_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.13_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCMonth.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getUTCMonth.length  !== true) {
 }
 
 if (Date.prototype.getUTCMonth.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getUTCMonth.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCMonth.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCSeconds/S15.9.5.23_A1_T2.js b/test/built-ins/Date/prototype/getUTCSeconds/S15.9.5.23_A1_T2.js
index 4403cdc09c372b5475d761303d4b9c34589eea5c..1b422daae59503e370b054b93f7b5bdb23b5579a 100644
--- a/test/built-ins/Date/prototype/getUTCSeconds/S15.9.5.23_A1_T2.js
+++ b/test/built-ins/Date/prototype/getUTCSeconds/S15.9.5.23_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "getUTCSeconds" has { DontEnum } attributes
 es5id: 15.9.5.23_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCSeconds  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.getUTCSeconds  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('getUTCSeconds')) {
-  $FAIL('#2: The Date.prototype.getUTCSeconds property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCSeconds property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/getUTCSeconds/S15.9.5.23_A3_T2.js b/test/built-ins/Date/prototype/getUTCSeconds/S15.9.5.23_A3_T2.js
index 033e80c1a46d6755e5c1ac30a022536d732da660..45df042970c325580a270e0be93a841e4e344b99 100644
--- a/test/built-ins/Date/prototype/getUTCSeconds/S15.9.5.23_A3_T2.js
+++ b/test/built-ins/Date/prototype/getUTCSeconds/S15.9.5.23_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.23_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.getUTCSeconds.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.getUTCSeconds.length  !== true) {
 }
 
 if (Date.prototype.getUTCSeconds.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.getUTCSeconds.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.getUTCSeconds.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setDate/S15.9.5.36_A1_T2.js b/test/built-ins/Date/prototype/setDate/S15.9.5.36_A1_T2.js
index e5aebc325aebb4bf5973fba31f36f21d85addb8d..a97a416dadc37a200f28e877d91b3e4783e4de1e 100644
--- a/test/built-ins/Date/prototype/setDate/S15.9.5.36_A1_T2.js
+++ b/test/built-ins/Date/prototype/setDate/S15.9.5.36_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setDate" has { DontEnum } attributes
 es5id: 15.9.5.36_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setDate  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setDate  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setDate')) {
-  $FAIL('#2: The Date.prototype.setDate property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setDate property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setDate/S15.9.5.36_A3_T2.js b/test/built-ins/Date/prototype/setDate/S15.9.5.36_A3_T2.js
index 1633c3df3296ab2cad5c6977555df531ecf56971..a25cc9009eecb6d4ff527791bb7031dae2498e39 100644
--- a/test/built-ins/Date/prototype/setDate/S15.9.5.36_A3_T2.js
+++ b/test/built-ins/Date/prototype/setDate/S15.9.5.36_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.36_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setDate.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setDate.length  !== true) {
 }
 
 if (Date.prototype.setDate.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setDate.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setDate.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setFullYear/S15.9.5.40_A1_T2.js b/test/built-ins/Date/prototype/setFullYear/S15.9.5.40_A1_T2.js
index 64f1f8fcfe45f4f68a16a43ef8ac7ebf9e6bb590..1ceca743a42a55c963a795844db4eaf65eb0a144 100644
--- a/test/built-ins/Date/prototype/setFullYear/S15.9.5.40_A1_T2.js
+++ b/test/built-ins/Date/prototype/setFullYear/S15.9.5.40_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setFullYear" has { DontEnum } attributes
 es5id: 15.9.5.40_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setFullYear  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setFullYear  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setFullYear')) {
-  $FAIL('#2: The Date.prototype.setFullYear property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setFullYear property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setFullYear/S15.9.5.40_A3_T2.js b/test/built-ins/Date/prototype/setFullYear/S15.9.5.40_A3_T2.js
index 2eafc662ea0a1fc3d8e35116663860606683bed4..34ecbb2e638277914a9dfe49319f7c033e87bb23 100644
--- a/test/built-ins/Date/prototype/setFullYear/S15.9.5.40_A3_T2.js
+++ b/test/built-ins/Date/prototype/setFullYear/S15.9.5.40_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.40_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setFullYear.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setFullYear.length  !== true) {
 }
 
 if (Date.prototype.setFullYear.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setFullYear.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setFullYear.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setHours/S15.9.5.34_A1_T2.js b/test/built-ins/Date/prototype/setHours/S15.9.5.34_A1_T2.js
index 6634bf5be0914cd4370b239e4c61ee8f734f6983..a0de4913bc4fb9d3f5cb5eb7bd5107bc15fe3410 100644
--- a/test/built-ins/Date/prototype/setHours/S15.9.5.34_A1_T2.js
+++ b/test/built-ins/Date/prototype/setHours/S15.9.5.34_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setHours" has { DontEnum } attributes
 es5id: 15.9.5.34_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setHours  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setHours  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setHours')) {
-  $FAIL('#2: The Date.prototype.setHours property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setHours property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setHours/S15.9.5.34_A3_T2.js b/test/built-ins/Date/prototype/setHours/S15.9.5.34_A3_T2.js
index 2237d13d662628bd345a045322f49c87525115fe..ee7cdd9c46604952829467984ea48b7c720f61e0 100644
--- a/test/built-ins/Date/prototype/setHours/S15.9.5.34_A3_T2.js
+++ b/test/built-ins/Date/prototype/setHours/S15.9.5.34_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.34_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setHours.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setHours.length  !== true) {
 }
 
 if (Date.prototype.setHours.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setHours.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setHours.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setMilliseconds/S15.9.5.28_A1_T2.js b/test/built-ins/Date/prototype/setMilliseconds/S15.9.5.28_A1_T2.js
index b01e55dd21f3a648648b123689df507879d2e763..99c85395c04c7e6ac527b140595ffd960c4d62ff 100644
--- a/test/built-ins/Date/prototype/setMilliseconds/S15.9.5.28_A1_T2.js
+++ b/test/built-ins/Date/prototype/setMilliseconds/S15.9.5.28_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setMilliseconds" has { DontEnum } attributes
 es5id: 15.9.5.28_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setMilliseconds  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setMilliseconds  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setMilliseconds')) {
-  $FAIL('#2: The Date.prototype.setMilliseconds property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setMilliseconds property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setMilliseconds/S15.9.5.28_A3_T2.js b/test/built-ins/Date/prototype/setMilliseconds/S15.9.5.28_A3_T2.js
index e24fa1705794d9839caa36dbaf2566d260f5b0ff..60a3a41a83c03d8e63354884aa1719176de2f9cd 100644
--- a/test/built-ins/Date/prototype/setMilliseconds/S15.9.5.28_A3_T2.js
+++ b/test/built-ins/Date/prototype/setMilliseconds/S15.9.5.28_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.28_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setMilliseconds.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setMilliseconds.length  !== true) {
 }
 
 if (Date.prototype.setMilliseconds.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setMilliseconds.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setMilliseconds.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setMinutes/S15.9.5.32_A1_T2.js b/test/built-ins/Date/prototype/setMinutes/S15.9.5.32_A1_T2.js
index 2ff250b900c091fcfb37a1e139a419db24fb7c17..fba25657f37dd20cd5d38a4ca183f1fd83d41dc3 100644
--- a/test/built-ins/Date/prototype/setMinutes/S15.9.5.32_A1_T2.js
+++ b/test/built-ins/Date/prototype/setMinutes/S15.9.5.32_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setMinutes" has { DontEnum } attributes
 es5id: 15.9.5.32_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setMinutes  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setMinutes  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setMinutes')) {
-  $FAIL('#2: The Date.prototype.setMinutes property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setMinutes property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setMinutes/S15.9.5.32_A3_T2.js b/test/built-ins/Date/prototype/setMinutes/S15.9.5.32_A3_T2.js
index 1577b743f927558e87016472ee677d14679c4965..1a3c9e03847952f9322f94b04ada409591c8fba7 100644
--- a/test/built-ins/Date/prototype/setMinutes/S15.9.5.32_A3_T2.js
+++ b/test/built-ins/Date/prototype/setMinutes/S15.9.5.32_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.32_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setMinutes.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setMinutes.length  !== true) {
 }
 
 if (Date.prototype.setMinutes.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setMinutes.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setMinutes.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setMonth/S15.9.5.38_A1_T2.js b/test/built-ins/Date/prototype/setMonth/S15.9.5.38_A1_T2.js
index 7adbd409a2087b34ff40cab3a86b525a4c720591..b0248c8ca591db057f476abb68d4bb7e40a775df 100644
--- a/test/built-ins/Date/prototype/setMonth/S15.9.5.38_A1_T2.js
+++ b/test/built-ins/Date/prototype/setMonth/S15.9.5.38_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setMonth" has { DontEnum } attributes
 es5id: 15.9.5.38_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setMonth  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setMonth  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setMonth')) {
-  $FAIL('#2: The Date.prototype.setMonth property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setMonth property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setMonth/S15.9.5.38_A3_T2.js b/test/built-ins/Date/prototype/setMonth/S15.9.5.38_A3_T2.js
index 194ebaa6c57c6dad9f48a3bc68bc9b65326ddf31..f1b40472a81a210022692b0c2fb095a6bb0ac625 100644
--- a/test/built-ins/Date/prototype/setMonth/S15.9.5.38_A3_T2.js
+++ b/test/built-ins/Date/prototype/setMonth/S15.9.5.38_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.38_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setMonth.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setMonth.length  !== true) {
 }
 
 if (Date.prototype.setMonth.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setMonth.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setMonth.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setSeconds/S15.9.5.30_A1_T2.js b/test/built-ins/Date/prototype/setSeconds/S15.9.5.30_A1_T2.js
index 68ab36592ab5b08f1828260f82d12f04bb3d691a..b2e687af852c38ee8e22fb2d4bb8138f732287de 100644
--- a/test/built-ins/Date/prototype/setSeconds/S15.9.5.30_A1_T2.js
+++ b/test/built-ins/Date/prototype/setSeconds/S15.9.5.30_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setSeconds" has { DontEnum } attributes
 es5id: 15.9.5.30_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setSeconds  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setSeconds  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setSeconds')) {
-  $FAIL('#2: The Date.prototype.setSeconds property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setSeconds property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setSeconds/S15.9.5.30_A3_T2.js b/test/built-ins/Date/prototype/setSeconds/S15.9.5.30_A3_T2.js
index 9ddb4d8d172a30c78e210f87ac7099019238ae99..9a30c83177c14b898581a249974aefaf2c321d5b 100644
--- a/test/built-ins/Date/prototype/setSeconds/S15.9.5.30_A3_T2.js
+++ b/test/built-ins/Date/prototype/setSeconds/S15.9.5.30_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.30_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setSeconds.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setSeconds.length  !== true) {
 }
 
 if (Date.prototype.setSeconds.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setSeconds.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setSeconds.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setTime/S15.9.5.27_A1_T2.js b/test/built-ins/Date/prototype/setTime/S15.9.5.27_A1_T2.js
index 8fec83d35317def2e0be0a22c5fba2992ad84dd1..7af5265017cebb4a74b930d008a541f4beab9029 100644
--- a/test/built-ins/Date/prototype/setTime/S15.9.5.27_A1_T2.js
+++ b/test/built-ins/Date/prototype/setTime/S15.9.5.27_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setTime" has { DontEnum } attributes
 es5id: 15.9.5.27_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setTime  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setTime  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setTime')) {
-  $FAIL('#2: The Date.prototype.setTime property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setTime property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setTime/S15.9.5.27_A3_T2.js b/test/built-ins/Date/prototype/setTime/S15.9.5.27_A3_T2.js
index c9f6de29609529902de04f6d6a04fd8820183d58..14872d5ccea66a96b1691e0760a4f7333c6a9acf 100644
--- a/test/built-ins/Date/prototype/setTime/S15.9.5.27_A3_T2.js
+++ b/test/built-ins/Date/prototype/setTime/S15.9.5.27_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.27_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setTime.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setTime.length  !== true) {
 }
 
 if (Date.prototype.setTime.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setTime.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setTime.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCDate/S15.9.5.37_A1_T2.js b/test/built-ins/Date/prototype/setUTCDate/S15.9.5.37_A1_T2.js
index cffd442167400c2b2d89c90212265fe92c7ebebd..3dbb48507a7456f76dca1a7352dccc7b374a42c4 100644
--- a/test/built-ins/Date/prototype/setUTCDate/S15.9.5.37_A1_T2.js
+++ b/test/built-ins/Date/prototype/setUTCDate/S15.9.5.37_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setUTCDate" has { DontEnum } attributes
 es5id: 15.9.5.37_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCDate  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setUTCDate  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setUTCDate')) {
-  $FAIL('#2: The Date.prototype.setUTCDate property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCDate property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCDate/S15.9.5.37_A3_T2.js b/test/built-ins/Date/prototype/setUTCDate/S15.9.5.37_A3_T2.js
index ad6ba00b38a2d41238c6753acc7f1b4d70de3f44..5cd9ba120997be6e258cc40f6a2376a3e625b3fc 100644
--- a/test/built-ins/Date/prototype/setUTCDate/S15.9.5.37_A3_T2.js
+++ b/test/built-ins/Date/prototype/setUTCDate/S15.9.5.37_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.37_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCDate.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setUTCDate.length  !== true) {
 }
 
 if (Date.prototype.setUTCDate.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setUTCDate.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCDate.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCFullYear/S15.9.5.41_A1_T2.js b/test/built-ins/Date/prototype/setUTCFullYear/S15.9.5.41_A1_T2.js
index 7cbdd2a526ddb50e4afffb362033caef6733c21b..7d9400c198cbc91ec1065a1a6fcef9e75bfa11d8 100644
--- a/test/built-ins/Date/prototype/setUTCFullYear/S15.9.5.41_A1_T2.js
+++ b/test/built-ins/Date/prototype/setUTCFullYear/S15.9.5.41_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setUTCFullYear" has { DontEnum } attributes
 es5id: 15.9.5.41_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCFullYear  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setUTCFullYear  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setUTCFullYear')) {
-  $FAIL('#2: The Date.prototype.setUTCFullYear property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCFullYear property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCFullYear/S15.9.5.41_A3_T2.js b/test/built-ins/Date/prototype/setUTCFullYear/S15.9.5.41_A3_T2.js
index 3b8a0bea371f257d0d19130ab53ab2bc4fafa6f8..ca7d9d969047da59ba88767b7b3b821a25127dd9 100644
--- a/test/built-ins/Date/prototype/setUTCFullYear/S15.9.5.41_A3_T2.js
+++ b/test/built-ins/Date/prototype/setUTCFullYear/S15.9.5.41_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.41_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCFullYear.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setUTCFullYear.length  !== true) {
 }
 
 if (Date.prototype.setUTCFullYear.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setUTCFullYear.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCFullYear.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCHours/S15.9.5.35_A1_T2.js b/test/built-ins/Date/prototype/setUTCHours/S15.9.5.35_A1_T2.js
index e362752abd22c77436c52712b66a1210cc3ae869..d74a9a0c69bd39d2f2e4ce4df87cb8790aa49494 100644
--- a/test/built-ins/Date/prototype/setUTCHours/S15.9.5.35_A1_T2.js
+++ b/test/built-ins/Date/prototype/setUTCHours/S15.9.5.35_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setUTCHours" has { DontEnum } attributes
 es5id: 15.9.5.35_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCHours  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setUTCHours  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setUTCHours')) {
-  $FAIL('#2: The Date.prototype.setUTCHours property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCHours property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCHours/S15.9.5.35_A3_T2.js b/test/built-ins/Date/prototype/setUTCHours/S15.9.5.35_A3_T2.js
index 282025d152430304399eb46c92fa4c7a3e9a6515..26d21699d8dae5793ea7ec29fa34e770ba6e9a88 100644
--- a/test/built-ins/Date/prototype/setUTCHours/S15.9.5.35_A3_T2.js
+++ b/test/built-ins/Date/prototype/setUTCHours/S15.9.5.35_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.35_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCHours.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setUTCHours.length  !== true) {
 }
 
 if (Date.prototype.setUTCHours.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setUTCHours.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCHours.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCMilliseconds/S15.9.5.29_A1_T2.js b/test/built-ins/Date/prototype/setUTCMilliseconds/S15.9.5.29_A1_T2.js
index b18a24575606225d80ee02bf7f467e6fe8a94882..5807247f346af51541ae80f69dc2e17a5552a338 100644
--- a/test/built-ins/Date/prototype/setUTCMilliseconds/S15.9.5.29_A1_T2.js
+++ b/test/built-ins/Date/prototype/setUTCMilliseconds/S15.9.5.29_A1_T2.js
@@ -7,7 +7,6 @@ info: >
     attributes
 es5id: 15.9.5.29_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCMilliseconds  === false) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setUTCMilliseconds  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setUTCMilliseconds')) {
-  $FAIL('#2: The Date.prototype.setUTCMilliseconds property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCMilliseconds property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCMilliseconds/S15.9.5.29_A3_T2.js b/test/built-ins/Date/prototype/setUTCMilliseconds/S15.9.5.29_A3_T2.js
index 7282c3915302ed0035539b3961a0be93bc248e83..7c7d36728d7a8154feb6575ead5d39aaf5ae1c18 100644
--- a/test/built-ins/Date/prototype/setUTCMilliseconds/S15.9.5.29_A3_T2.js
+++ b/test/built-ins/Date/prototype/setUTCMilliseconds/S15.9.5.29_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.29_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCMilliseconds.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setUTCMilliseconds.length  !== true) {
 }
 
 if (Date.prototype.setUTCMilliseconds.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setUTCMilliseconds.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCMilliseconds.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCMinutes/S15.9.5.33_A1_T2.js b/test/built-ins/Date/prototype/setUTCMinutes/S15.9.5.33_A1_T2.js
index f397ec2bf3b806d336b3980837d4c3948a85e7cb..8face611461bf16c8a5e4c1bcb3d3a3249541966 100644
--- a/test/built-ins/Date/prototype/setUTCMinutes/S15.9.5.33_A1_T2.js
+++ b/test/built-ins/Date/prototype/setUTCMinutes/S15.9.5.33_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setUTCMinutes" has { DontEnum } attributes
 es5id: 15.9.5.33_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCMinutes  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setUTCMinutes  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setUTCMinutes')) {
-  $FAIL('#2: The Date.prototype.setUTCMinutes property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCMinutes property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCMinutes/S15.9.5.33_A3_T2.js b/test/built-ins/Date/prototype/setUTCMinutes/S15.9.5.33_A3_T2.js
index e46973d2774b256528ebe131b445846417856e48..9f0f5a53bf7c328b0f26d0162bb5a51afd17a4f2 100644
--- a/test/built-ins/Date/prototype/setUTCMinutes/S15.9.5.33_A3_T2.js
+++ b/test/built-ins/Date/prototype/setUTCMinutes/S15.9.5.33_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.33_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCMinutes.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setUTCMinutes.length  !== true) {
 }
 
 if (Date.prototype.setUTCMinutes.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setUTCMinutes.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCMinutes.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCMonth/S15.9.5.39_A1_T2.js b/test/built-ins/Date/prototype/setUTCMonth/S15.9.5.39_A1_T2.js
index 871cfc5744785704e8d9b47aab07dcd205eee53f..fa6099af660e162d7a9d0e3d0acd4cda2cf85408 100644
--- a/test/built-ins/Date/prototype/setUTCMonth/S15.9.5.39_A1_T2.js
+++ b/test/built-ins/Date/prototype/setUTCMonth/S15.9.5.39_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setUTCMonth" has { DontEnum } attributes
 es5id: 15.9.5.39_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCMonth  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setUTCMonth  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setUTCMonth')) {
-  $FAIL('#2: The Date.prototype.setUTCMonth property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCMonth property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCMonth/S15.9.5.39_A3_T2.js b/test/built-ins/Date/prototype/setUTCMonth/S15.9.5.39_A3_T2.js
index fdb4dbad71f853aba05156824d10ad351ae8b5b1..4b1b66c700dd76642351896367eed9beb79ae15e 100644
--- a/test/built-ins/Date/prototype/setUTCMonth/S15.9.5.39_A3_T2.js
+++ b/test/built-ins/Date/prototype/setUTCMonth/S15.9.5.39_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.39_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCMonth.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setUTCMonth.length  !== true) {
 }
 
 if (Date.prototype.setUTCMonth.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setUTCMonth.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCMonth.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCSeconds/S15.9.5.31_A1_T2.js b/test/built-ins/Date/prototype/setUTCSeconds/S15.9.5.31_A1_T2.js
index 2b1764486c1407546582228e187875fee4ee085e..2eb1ae4f6347497bbbd5668dcf3155b8747fff15 100644
--- a/test/built-ins/Date/prototype/setUTCSeconds/S15.9.5.31_A1_T2.js
+++ b/test/built-ins/Date/prototype/setUTCSeconds/S15.9.5.31_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "setUTCSeconds" has { DontEnum } attributes
 es5id: 15.9.5.31_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCSeconds  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.setUTCSeconds  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('setUTCSeconds')) {
-  $FAIL('#2: The Date.prototype.setUTCSeconds property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCSeconds property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/setUTCSeconds/S15.9.5.31_A3_T2.js b/test/built-ins/Date/prototype/setUTCSeconds/S15.9.5.31_A3_T2.js
index 823fc9a808760bb38e36d5615505d6f612de2324..85c4469904479bb98e61a25c726f274ee00e50d4 100644
--- a/test/built-ins/Date/prototype/setUTCSeconds/S15.9.5.31_A3_T2.js
+++ b/test/built-ins/Date/prototype/setUTCSeconds/S15.9.5.31_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.31_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.setUTCSeconds.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.setUTCSeconds.length  !== true) {
 }
 
 if (Date.prototype.setUTCSeconds.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.setUTCSeconds.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.setUTCSeconds.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toDateString/S15.9.5.3_A1_T2.js b/test/built-ins/Date/prototype/toDateString/S15.9.5.3_A1_T2.js
index d68c01ea179da625f1c588f538a18165e52e5c24..6136b6ecabed0836293fe0b5b5b9a45e48fa02fb 100644
--- a/test/built-ins/Date/prototype/toDateString/S15.9.5.3_A1_T2.js
+++ b/test/built-ins/Date/prototype/toDateString/S15.9.5.3_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "toDateString" has { DontEnum } attributes
 es5id: 15.9.5.3_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toDateString  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.toDateString  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('toDateString')) {
-  $FAIL('#2: The Date.prototype.toDateString property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toDateString property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toDateString/S15.9.5.3_A3_T2.js b/test/built-ins/Date/prototype/toDateString/S15.9.5.3_A3_T2.js
index d297f959a2f40b4aae37be1c9b3dabfde0959063..3f09b6a12ff91dcb1201add6786c7573d789426f 100644
--- a/test/built-ins/Date/prototype/toDateString/S15.9.5.3_A3_T2.js
+++ b/test/built-ins/Date/prototype/toDateString/S15.9.5.3_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.3_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toDateString.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.toDateString.length  !== true) {
 }
 
 if (Date.prototype.toDateString.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.toDateString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toDateString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toLocaleDateString/S15.9.5.6_A1_T2.js b/test/built-ins/Date/prototype/toLocaleDateString/S15.9.5.6_A1_T2.js
index b1b56c4474ed56d089c50001d3fc823fff8b6b9f..8549aae89e79278300a6cfd919b075a88bd81d79 100644
--- a/test/built-ins/Date/prototype/toLocaleDateString/S15.9.5.6_A1_T2.js
+++ b/test/built-ins/Date/prototype/toLocaleDateString/S15.9.5.6_A1_T2.js
@@ -7,7 +7,6 @@ info: >
     attributes
 es5id: 15.9.5.6_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toLocaleDateString  === false) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.toLocaleDateString  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('toLocaleDateString')) {
-  $FAIL('#2: The Date.prototype.toLocaleDateString property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toLocaleDateString property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toLocaleDateString/S15.9.5.6_A3_T2.js b/test/built-ins/Date/prototype/toLocaleDateString/S15.9.5.6_A3_T2.js
index c190415c83265d05198877846da3b41aa14da083..e235b45a5d2af1dce2f283696ea898ac4417ed90 100644
--- a/test/built-ins/Date/prototype/toLocaleDateString/S15.9.5.6_A3_T2.js
+++ b/test/built-ins/Date/prototype/toLocaleDateString/S15.9.5.6_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.6_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toLocaleDateString.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.toLocaleDateString.length  !== true) {
 }
 
 if (Date.prototype.toLocaleDateString.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.toLocaleDateString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toLocaleDateString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toLocaleString/S15.9.5.5_A1_T2.js b/test/built-ins/Date/prototype/toLocaleString/S15.9.5.5_A1_T2.js
index c1061d5b58e804ab4f9e7a51a52c9fa89fe47db6..5df02675afb05330e0096ec7458abbb15b8df661 100644
--- a/test/built-ins/Date/prototype/toLocaleString/S15.9.5.5_A1_T2.js
+++ b/test/built-ins/Date/prototype/toLocaleString/S15.9.5.5_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "toLocaleString" has { DontEnum } attributes
 es5id: 15.9.5.5_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toLocaleString  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.toLocaleString  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('toLocaleString')) {
-  $FAIL('#2: The Date.prototype.toLocaleString property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toLocaleString property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toLocaleString/S15.9.5.5_A3_T2.js b/test/built-ins/Date/prototype/toLocaleString/S15.9.5.5_A3_T2.js
index 52febd120159bdd7627e6c6a2bf9a913cfbe1371..890f6f29235010478fe9b6e64b57c4668166a9fb 100644
--- a/test/built-ins/Date/prototype/toLocaleString/S15.9.5.5_A3_T2.js
+++ b/test/built-ins/Date/prototype/toLocaleString/S15.9.5.5_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.5_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toLocaleString.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.toLocaleString.length  !== true) {
 }
 
 if (Date.prototype.toLocaleString.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.toLocaleString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toLocaleString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toLocaleTimeString/S15.9.5.7_A1_T2.js b/test/built-ins/Date/prototype/toLocaleTimeString/S15.9.5.7_A1_T2.js
index 947ed48be67d84eece6189f9243304cb723c42db..d3178856fa6caf775838fc0c1329e4a5e8c8495f 100644
--- a/test/built-ins/Date/prototype/toLocaleTimeString/S15.9.5.7_A1_T2.js
+++ b/test/built-ins/Date/prototype/toLocaleTimeString/S15.9.5.7_A1_T2.js
@@ -7,7 +7,6 @@ info: >
     attributes
 es5id: 15.9.5.7_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toLocaleTimeString  === false) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.toLocaleTimeString  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('toLocaleTimeString')) {
-  $FAIL('#2: The Date.prototype.toLocaleTimeString property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toLocaleTimeString property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toLocaleTimeString/S15.9.5.7_A3_T2.js b/test/built-ins/Date/prototype/toLocaleTimeString/S15.9.5.7_A3_T2.js
index c08572b292f871989625f67364b6f7ee7e9c6e38..36f964a39b316374358f938be358ebb2ec40079d 100644
--- a/test/built-ins/Date/prototype/toLocaleTimeString/S15.9.5.7_A3_T2.js
+++ b/test/built-ins/Date/prototype/toLocaleTimeString/S15.9.5.7_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.7_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toLocaleTimeString.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.toLocaleTimeString.length  !== true) {
 }
 
 if (Date.prototype.toLocaleTimeString.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.toLocaleTimeString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toLocaleTimeString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toString/S15.9.5.2_A1_T2.js b/test/built-ins/Date/prototype/toString/S15.9.5.2_A1_T2.js
index 3464ae57541b7cdd9a3b0b3efb1e237c98854ff0..94e3603305163ef75c493114a3322861594e2b63 100644
--- a/test/built-ins/Date/prototype/toString/S15.9.5.2_A1_T2.js
+++ b/test/built-ins/Date/prototype/toString/S15.9.5.2_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "toString" has { DontEnum } attributes
 es5id: 15.9.5.2_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toString  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.toString  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('toString')) {
-  $FAIL('#2: The Date.prototype.toString property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toString property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toString/S15.9.5.2_A3_T2.js b/test/built-ins/Date/prototype/toString/S15.9.5.2_A3_T2.js
index c2be0b2af00664ff2cc2ad70f8afc19714bc083b..168405b37364044aad56b21331f7c18712c669fa 100644
--- a/test/built-ins/Date/prototype/toString/S15.9.5.2_A3_T2.js
+++ b/test/built-ins/Date/prototype/toString/S15.9.5.2_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.2_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toString.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.toString.length  !== true) {
 }
 
 if (Date.prototype.toString.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.toString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toTimeString/S15.9.5.4_A1_T2.js b/test/built-ins/Date/prototype/toTimeString/S15.9.5.4_A1_T2.js
index 9eb2e28476ccd85f1a203f0135c4c9ad111cc6b2..445823b5861f1a9e0a00c43daab9124b701ee13e 100644
--- a/test/built-ins/Date/prototype/toTimeString/S15.9.5.4_A1_T2.js
+++ b/test/built-ins/Date/prototype/toTimeString/S15.9.5.4_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "toTimeString" has { DontEnum } attributes
 es5id: 15.9.5.4_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toTimeString  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.toTimeString  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('toTimeString')) {
-  $FAIL('#2: The Date.prototype.toTimeString property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toTimeString property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toTimeString/S15.9.5.4_A3_T2.js b/test/built-ins/Date/prototype/toTimeString/S15.9.5.4_A3_T2.js
index 2a8fe4a9da5e20fe223f8825e1ff513c703c2f2a..a49e2480cc29226724ca700119b66e6022b5b0ff 100644
--- a/test/built-ins/Date/prototype/toTimeString/S15.9.5.4_A3_T2.js
+++ b/test/built-ins/Date/prototype/toTimeString/S15.9.5.4_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.4_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toTimeString.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.toTimeString.length  !== true) {
 }
 
 if (Date.prototype.toTimeString.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.toTimeString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toTimeString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toUTCString/S15.9.5.42_A1_T2.js b/test/built-ins/Date/prototype/toUTCString/S15.9.5.42_A1_T2.js
index 6388ba69ac20f4da42ef5fb04884b7f8f59ee510..38e41adc866398311343ff8f0196afa4adc2682e 100644
--- a/test/built-ins/Date/prototype/toUTCString/S15.9.5.42_A1_T2.js
+++ b/test/built-ins/Date/prototype/toUTCString/S15.9.5.42_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "toUTCString" has { DontEnum } attributes
 es5id: 15.9.5.42_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toUTCString  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.toUTCString  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('toUTCString')) {
-  $FAIL('#2: The Date.prototype.toUTCString property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toUTCString property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/toUTCString/S15.9.5.42_A3_T2.js b/test/built-ins/Date/prototype/toUTCString/S15.9.5.42_A3_T2.js
index 05ec9df91cc364edd28365f7271d8b1c4c8108a1..308d5644a12acc180c66b63fdc8499073833f917 100644
--- a/test/built-ins/Date/prototype/toUTCString/S15.9.5.42_A3_T2.js
+++ b/test/built-ins/Date/prototype/toUTCString/S15.9.5.42_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.42_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.toUTCString.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.toUTCString.length  !== true) {
 }
 
 if (Date.prototype.toUTCString.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.toUTCString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.toUTCString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/valueOf/S15.9.5.8_A1_T2.js b/test/built-ins/Date/prototype/valueOf/S15.9.5.8_A1_T2.js
index e0275ef29e6b71622f87791f41eed3083c95f5a3..a5bac91b9e9f41a2890acafb82654004b00f1db4 100644
--- a/test/built-ins/Date/prototype/valueOf/S15.9.5.8_A1_T2.js
+++ b/test/built-ins/Date/prototype/valueOf/S15.9.5.8_A1_T2.js
@@ -5,7 +5,6 @@
 info: The Date.prototype property "valueOf" has { DontEnum } attributes
 es5id: 15.9.5.8_A1_T2
 description: Checking absence of DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.valueOf  === false) {
@@ -13,5 +12,5 @@ if (delete Date.prototype.valueOf  === false) {
 }
 
 if (Date.prototype.hasOwnProperty('valueOf')) {
-  $FAIL('#2: The Date.prototype.valueOf property has not the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.valueOf property has not the attributes DontDelete');
 }
diff --git a/test/built-ins/Date/prototype/valueOf/S15.9.5.8_A3_T2.js b/test/built-ins/Date/prototype/valueOf/S15.9.5.8_A3_T2.js
index 2279e196e8bce2b9d9145ac8383410ef01bf2cb0..650e06ad5640e9da1d594455044b60a21768b49e 100644
--- a/test/built-ins/Date/prototype/valueOf/S15.9.5.8_A3_T2.js
+++ b/test/built-ins/Date/prototype/valueOf/S15.9.5.8_A3_T2.js
@@ -7,7 +7,6 @@ info: >
     DontDelete, DontEnum } attributes
 es5id: 15.9.5.8_A3_T2
 description: Checking DontDelete attribute
-includes: [$FAIL.js]
 ---*/
 
 if (delete Date.prototype.valueOf.length  !== true) {
@@ -15,5 +14,5 @@ if (delete Date.prototype.valueOf.length  !== true) {
 }
 
 if (Date.prototype.valueOf.hasOwnProperty('length')) {
-  $FAIL('#2: The Date.prototype.valueOf.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Date.prototype.valueOf.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Error/prototype/S15.11.4_A3.js b/test/built-ins/Error/prototype/S15.11.4_A3.js
index 8dbfec33b71a66372be3edfeb102cbba9fdad4ae..97973f18c308838d93ccdb05366a6094707a71de 100644
--- a/test/built-ins/Error/prototype/S15.11.4_A3.js
+++ b/test/built-ins/Error/prototype/S15.11.4_A3.js
@@ -6,7 +6,6 @@ info: Since Error prototype object is not function it has no [[Call]] method
 es5id: 15.11.4_A3
 description: Checking if call of Error prototype as a function fails
 includes:
-    - $FAIL.js
     - Test262Error.js
 ---*/
 
@@ -14,7 +13,7 @@ includes:
 //CHECK#1
 try {
 	Error.prototype();
-	$FAIL('#1: "Error.prototype()" lead to throwing exception');
+	$ERROR('#1: "Error.prototype()" lead to throwing exception');
 } catch (e) {
     if (e instanceof Test262Error) throw e;
 }
diff --git a/test/built-ins/Error/prototype/S15.11.4_A4.js b/test/built-ins/Error/prototype/S15.11.4_A4.js
index ea86628300c756954764b82d4118fa944703f6e7..9a74e57a4ddaeae418960275d5bdb12abbe59939 100644
--- a/test/built-ins/Error/prototype/S15.11.4_A4.js
+++ b/test/built-ins/Error/prototype/S15.11.4_A4.js
@@ -6,7 +6,6 @@ info: Since Error prototype object is not function it has no [[Construct]] metho
 es5id: 15.11.4_A4
 description: Checking if creating "new Error.prototype" fails
 includes:
-    - $FAIL.js
     - Test262Error.js
 ---*/
 
@@ -14,7 +13,7 @@ includes:
 //CHECK#1
 try {
 	var __instance = new Error.prototype;
-	$FAIL('#1: "var __instance = new Error.prototype" lead to throwing exception');
+	$ERROR('#1: "var __instance = new Error.prototype" lead to throwing exception');
 } catch (e) {
     if (e instanceof Test262Error) throw e;
 }
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T1.js b/test/built-ins/Function/S15.3.2.1_A1_T1.js
index 8a1721636d0b5056fb54ff2d5fb39ab0aa25b715..5763fc1880d17cb52625be06e088bafa735fe9d0 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T1.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T1.js
@@ -12,7 +12,6 @@ info: >
     v) Return Result(iv)
 es5id: 15.3.2.1_A1_T1
 description: "The body of the function is \"{toString:function(){throw 7;}}\""
-includes: [$FAIL.js]
 ---*/
 
 var body = {toString:function(){throw 7;}}
@@ -20,7 +19,7 @@ var body = {toString:function(){throw 7;}}
 //CHECK#1
 try {
   var f = new Function(body);
-  $FAIL('#1: When the Function constructor is called with one argument then body be that argument the following step are taken: call ToString(body)');
+  $ERROR('#1: When the Function constructor is called with one argument then body be that argument the following step are taken: call ToString(body)');
 } catch (e) {
   if (e !== 7) {
   	$ERROR('#1.1: When the Function constructor is called with one argument then body be that argument the following step are taken: call ToString(body)');
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T10.js b/test/built-ins/Function/S15.3.2.1_A1_T10.js
index 8f5f661a9144f604c4b705b17b40e63dbccf6e15..9b29aba2dfe161406e69e1bba73a4004c4725ff1 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T10.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T10.js
@@ -12,14 +12,13 @@ info: >
     v) Return Result(iv)
 es5id: 15.3.2.1_A1_T10
 description: Value of the function constructor argument is "null"
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = new Function(null);
 } catch (e) {
-  $FAIL('#1: test fails with error '+e);
+  $ERROR('#1: test fails with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T11.js b/test/built-ins/Function/S15.3.2.1_A1_T11.js
index f4ad7db5f4dbe956963df12e212f95b693f9fa37..e41c524817c2dca5296c3e0d4a72b041a2da6fa7 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T11.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T11.js
@@ -12,14 +12,13 @@ info: >
     v) Return Result(iv)
 es5id: 15.3.2.1_A1_T11
 description: Value of the function constructor argument is "undefined"
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = new Function(undefined);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T12.js b/test/built-ins/Function/S15.3.2.1_A1_T12.js
index 935b6940b8e3e63591f2c9218bb8d80bc247f3e5..f7cba7e30d54c2dc1358c0f19574b3dd15b1f00a 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T12.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T12.js
@@ -12,14 +12,13 @@ info: >
     v) Return Result(iv)
 es5id: 15.3.2.1_A1_T12
 description: Value of the function constructor argument is "void 0"
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = new Function(void 0);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T13.js b/test/built-ins/Function/S15.3.2.1_A1_T13.js
index a5d43a6b25b1293816effe58733e16144dd83fbb..e41fd8f559f6019ed40577a5c77400f925d78dff 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T13.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T13.js
@@ -12,13 +12,12 @@ info: >
     v) Return Result(iv)
 es5id: 15.3.2.1_A1_T13
 description: Value of the function constructor argument is "{}"
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = new Function({});
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 } catch (e) {
   if (!(e instanceof SyntaxError)) {
   	$ERROR('#1.1: If body is not parsable as FunctionBody then throw a SyntaxError exception');
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T2.js b/test/built-ins/Function/S15.3.2.1_A1_T2.js
index ee8bd7de683c96d40718556ea135c9a3537c3d20..db65116d49c14803713acd8ebaf49f0e8d6a7afd 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T2.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T2.js
@@ -14,7 +14,6 @@ es5id: 15.3.2.1_A1_T2
 description: >
     The body of the function is "{toString:function(){return "return
     1;";}}"
-includes: [$FAIL.js]
 ---*/
 
 var body={toString:function(){return "return 1;";}};
@@ -23,7 +22,7 @@ var body={toString:function(){return "return 1;";}};
 try {
   var f = new Function(body);	
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T3.js b/test/built-ins/Function/S15.3.2.1_A1_T3.js
index e9f77ee7c1ff2e8bad6c63f9949cf8321c43b126..5f4eaa59b4a1e7fc57da23d9f9665dcd73b13409 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T3.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T3.js
@@ -12,14 +12,13 @@ info: >
     v) Return Result(iv)
 es5id: 15.3.2.1_A1_T3
 description: Value of the function constructor argument is 1
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = new Function(1);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T4.js b/test/built-ins/Function/S15.3.2.1_A1_T4.js
index c9f7226fe0f8065ced741c3f29df7aa7d0484bdb..7e90cff1bca814de74aff267b9466e4a70c7a981 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T4.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T4.js
@@ -14,14 +14,13 @@ es5id: 15.3.2.1_A1_T4
 description: >
     Value of the function constructor argument is x, where x is
     specified with "undefined"
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = new Function(x);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T5.js b/test/built-ins/Function/S15.3.2.1_A1_T5.js
index 3b00cebde23c6772c2ec79e58fa5acae271e725d..d37d16a6cd040fdaa940d5303837018846662d5d 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T5.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T5.js
@@ -14,7 +14,6 @@ es5id: 15.3.2.1_A1_T5
 description: >
     Value of the function constructor argument is "Object("return
     \'A\'")"
-includes: [$FAIL.js]
 ---*/
 
 var body = Object("return \'A\'");
@@ -23,7 +22,7 @@ var body = Object("return \'A\'");
 try {
   var f = new Function(body);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T6.js b/test/built-ins/Function/S15.3.2.1_A1_T6.js
index 5b975616cd6dd0e9949783acd28929a92f80c0ff..d1589d2f653e4f6cebca438059281c54e944506c 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T6.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T6.js
@@ -14,14 +14,13 @@ es5id: 15.3.2.1_A1_T6
 description: >
     Value of the function constructor argument is the string "return
     true;"
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = new Function("return true;");
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T7.js b/test/built-ins/Function/S15.3.2.1_A1_T7.js
index 8e8faaf5121993d0a21aae8c7f878b00a27b48b0..ab83a179b03ee4056ceb52dd4d8fe4341be5137d 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T7.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T7.js
@@ -12,7 +12,6 @@ info: >
     v) Return Result(iv)
 es5id: 15.3.2.1_A1_T7
 description: Value of the function constructor argument is "Object(1)"
-includes: [$FAIL.js]
 ---*/
 
 var body = new Object(1);
@@ -21,7 +20,7 @@ var body = new Object(1);
 try {
   var f = new Function(body);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A1_T8.js b/test/built-ins/Function/S15.3.2.1_A1_T8.js
index bcd9fddc98789f354f3bce8f381f123726dfb049..b617336c772729e90a7131595e5354a1dedad3c2 100644
--- a/test/built-ins/Function/S15.3.2.1_A1_T8.js
+++ b/test/built-ins/Function/S15.3.2.1_A1_T8.js
@@ -12,7 +12,6 @@ info: >
     v) Return Result(iv)
 es5id: 15.3.2.1_A1_T8
 description: Value of the function constructor argument is "var 1=1;"
-includes: [$FAIL.js]
 ---*/
 
 var body = "var 1=1;";
@@ -20,7 +19,7 @@ var body = "var 1=1;";
 //CHECK#1
 try {
   var f = new Function(body);
-  $FAIL('#1: If body is not parsable as FunctionBody then throw a SyntaxError exception');
+  $ERROR('#1: If body is not parsable as FunctionBody then throw a SyntaxError exception');
 } catch (e) {
   if (!(e instanceof SyntaxError)) {
   	$ERROR('#1.1: If body is not parsable as FunctionBody then throw a SyntaxError exception');
diff --git a/test/built-ins/Function/S15.3.2.1_A2_T1.js b/test/built-ins/Function/S15.3.2.1_A2_T1.js
index af2604cb0d8f50b1205514fdb7f1ffd012677ef2..ba5392aa7065f30085cc126cadc2fe5350ff6229 100644
--- a/test/built-ins/Function/S15.3.2.1_A2_T1.js
+++ b/test/built-ins/Function/S15.3.2.1_A2_T1.js
@@ -9,14 +9,13 @@ es5id: 15.3.2.1_A2_T1
 description: >
     Values of the function constructor arguments are "arg1", "arg2",
     "arg3", "return arg1+arg2+arg3;"
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = Function("arg1", "arg2", "arg3", "return arg1+arg2+arg3;");
 } catch (e) {
-  $FAIL('#1: test failed');
+  $ERROR('#1: test failed');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A2_T2.js b/test/built-ins/Function/S15.3.2.1_A2_T2.js
index ef1231a8ebbe107e0611d645e3927aecf94a6ace..faa3ec3371714687ab48b9d913692fd64b895851 100644
--- a/test/built-ins/Function/S15.3.2.1_A2_T2.js
+++ b/test/built-ins/Function/S15.3.2.1_A2_T2.js
@@ -9,14 +9,13 @@ es5id: 15.3.2.1_A2_T2
 description: >
     Values of the function constructor arguments are "arg1, arg2",
     "arg3", "return arg1+arg2+arg3;"
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = Function("arg1, arg2", "arg3", "return arg1+arg2+arg3;");
 } catch (e) {
-  $FAIL('#1: test failed');
+  $ERROR('#1: test failed');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A2_T3.js b/test/built-ins/Function/S15.3.2.1_A2_T3.js
index 26a4470d1e6d9f7cb2c5f9b0be61c32455267d08..1acf34802f8dc03c9685e8a0893443fdcf446348 100644
--- a/test/built-ins/Function/S15.3.2.1_A2_T3.js
+++ b/test/built-ins/Function/S15.3.2.1_A2_T3.js
@@ -9,14 +9,13 @@ es5id: 15.3.2.1_A2_T3
 description: >
     Values of the function constructor arguments are "arg1, arg2,
     arg3", "return arg1+arg2+arg3;"
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = Function("arg1, arg2, arg3", "return arg1+arg2+arg3;");
 } catch (e) {
-  $FAIL('#1: test failed');
+  $ERROR('#1: test failed');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A2_T4.js b/test/built-ins/Function/S15.3.2.1_A2_T4.js
index 0bf320e080d64c729400846661a4d2f121930840..8d25cbc8764d05941d7e4313a8f91c7a4581e3f4 100644
--- a/test/built-ins/Function/S15.3.2.1_A2_T4.js
+++ b/test/built-ins/Function/S15.3.2.1_A2_T4.js
@@ -9,7 +9,6 @@ es5id: 15.3.2.1_A2_T4
 description: >
     Values of the function constructor arguments are "return"-s of
     various results
-includes: [$FAIL.js]
 ---*/
 
 var i=0;
@@ -20,7 +19,7 @@ var p={toString:function(){return "arg"+(++i);}};
 try {
   var f = Function(p, p, p, "return arg1+arg2+arg3;");
 } catch (e) {
-  $FAIL('#1: test failed');
+  $ERROR('#1: test failed');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A2_T5.js b/test/built-ins/Function/S15.3.2.1_A2_T5.js
index 80a010598016852ca5c6ab3a4bfbb33d50204996..8dbdca9548c08009594f98486b1c17b33e7fc763 100644
--- a/test/built-ins/Function/S15.3.2.1_A2_T5.js
+++ b/test/built-ins/Function/S15.3.2.1_A2_T5.js
@@ -9,7 +9,6 @@ es5id: 15.3.2.1_A2_T5
 description: >
     Values of the function constructor arguments are "return"-s of
     various results and a concotenation of strings
-includes: [$FAIL.js]
 ---*/
 
 var i=0;
@@ -20,7 +19,7 @@ var p={toString:function(){return "arg"+(++i)}};
 try {
   var f = Function(p+","+p,p, "return arg1+arg2+arg3;");
 } catch (e) {
-  $FAIL('#1: test failed');
+  $ERROR('#1: test failed');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A2_T6.js b/test/built-ins/Function/S15.3.2.1_A2_T6.js
index f63ae274bff20c812db20639527a94211356b82d..0e6c6a6dd63980e770bd49ffe4c7ac6ba4c153af 100644
--- a/test/built-ins/Function/S15.3.2.1_A2_T6.js
+++ b/test/built-ins/Function/S15.3.2.1_A2_T6.js
@@ -9,7 +9,6 @@ es5id: 15.3.2.1_A2_T6
 description: >
     Values of the function constructor arguments are "return"-s of
     various results and a concotenation of strings
-includes: [$FAIL.js]
 ---*/
 
 var i=0;
@@ -20,7 +19,7 @@ var p={toString:function(){return "arg"+(++i)}};
 try {
   var f = Function(p+","+p+","+p, "return arg1+arg2+arg3;");
 } catch (e) {
-  $FAIL('#1: test failed');
+  $ERROR('#1: test failed');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T1.js b/test/built-ins/Function/S15.3.2.1_A3_T1.js
index c36119da03281df03eba0c2a8a7a5a089cd962a6..d9083e34d2aaa6394312fcb9094cca2d2d712fa1 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T1.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T1.js
@@ -17,7 +17,6 @@ description: >
     Values of the function constructor arguments are
     "{toString:function(){throw 1;}}" and "{toString:function(){throw
     'body';}}"
-includes: [$FAIL.js]
 ---*/
 
 var p = {toString:function(){throw 1;}};
@@ -26,7 +25,7 @@ var body = {toString:function(){throw "body";}};
 //CHECK#1
 try {
   var f = new Function(p,body);
-  $FAIL('#1: test failed');
+  $ERROR('#1: test failed');
 } catch (e) {
   if (e !== 1) {
   	$ERROR('#1.1: i) Let Result(i) be the first argument; ii) Let P be ToString(Result(i))');
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T10.js b/test/built-ins/Function/S15.3.2.1_A3_T10.js
index 8ebd3077ac6d0a0576406770de53f4c6d761766a..069dcf6bff1999bed8e91f63ba85067dabbe111b 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T10.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T10.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T10
 description: >
     Values of the function constructor arguments are
     "{toString:function(){return "z;x"}}" and "return this;"
-includes: [$FAIL.js]
 ---*/
 
 var body = "return this;";
@@ -25,7 +24,7 @@ var p={toString:function(){return "z;x"}};
 //CHECK#1
 try {
   var f = new Function(p,body);
-  $FAIL('#1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
+  $ERROR('#1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
 } catch (e) {
   if (!(e instanceof SyntaxError)) {
   	$ERROR('#1.1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T11.js b/test/built-ins/Function/S15.3.2.1_A3_T11.js
index a30dee17bdc6d2b9e4ca0c097febac624170348c..7ba1bb2e07f56a06c0f1920a3cb89770d6b14c12 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T11.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T11.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T11
 description: >
     Values of the function constructor arguments are "a,b,c" and "void
     0"
-includes: [$FAIL.js]
 ---*/
 
 var p = "a,b,c";
@@ -25,7 +24,7 @@ var p = "a,b,c";
 try {
   var f = new Function(p, void 0);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T12.js b/test/built-ins/Function/S15.3.2.1_A3_T12.js
index a74e8cb2d20a5c819a5086c665aaebdf6a5e773c..2c3fec3762a817384e736879e2e7fb9474af3e49 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T12.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T12.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T12
 description: >
     Values of the function constructor arguments are "a,b,c" and
     "undefined"
-includes: [$FAIL.js]
 ---*/
 
 var p = "a,b,c";
@@ -25,7 +24,7 @@ var p = "a,b,c";
 try {
   var f = new Function(p, undefined);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T13.js b/test/built-ins/Function/S15.3.2.1_A3_T13.js
index 59ad58aa1c797ce752286eb08635669fb8c5a60e..8a32529a42d958dc13c9b598f1d46ced6238a465 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T13.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T13.js
@@ -14,7 +14,6 @@ info: >
     vii) Return Result(vi)
 es5id: 15.3.2.1_A3_T13
 description: Values of the function constructor arguments are "a,b,c" and "null"
-includes: [$FAIL.js]
 ---*/
 
 var p = "a,b,c";
@@ -23,7 +22,7 @@ var p = "a,b,c";
 try {
   var f = new Function(p, null);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T14.js b/test/built-ins/Function/S15.3.2.1_A3_T14.js
index 8eb1e4070e28e1e13a30f2ac79d7ffe07922a659..389349a5e0d3a2e16a0d88206dbe46541a862d91 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T14.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T14.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T14
 description: >
     Values of the function constructor arguments are "a,b,c" and an
     undefined variable
-includes: [$FAIL.js]
 ---*/
 
 var p = "a,b,c";
@@ -25,7 +24,7 @@ var p = "a,b,c";
 try {
   var f = new Function(p, body);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T15.js b/test/built-ins/Function/S15.3.2.1_A3_T15.js
index 01d4b3f06f3a03771471a2f75ad612c1cb781306..77ac83bf88aa54146ca8e590ce1dc30352450245 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T15.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T15.js
@@ -16,14 +16,13 @@ es5id: 15.3.2.1_A3_T15
 description: >
     Values of the function constructor arguments are are two empty
     strings
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   var f = new Function("", "");
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T2.js b/test/built-ins/Function/S15.3.2.1_A3_T2.js
index 99ccb2d591a73d930e250a92f3456ec8413f837c..9db828b4dceb02631610ae9f5f0b774caaeb9a3e 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T2.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T2.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T2
 description: >
     Values of the function constructor arguments are
     "{toString:function(){return 'a';}}" and "return a;"
-includes: [$FAIL.js]
 ---*/
 
 var p = {toString:function(){return "a";}};
@@ -26,7 +25,7 @@ var body = "return a;";
 try {
   var f = new Function(p,body);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T3.js b/test/built-ins/Function/S15.3.2.1_A3_T3.js
index 8b8baf949735700c39c9cb2711529833428c7c14..2815e8a14d5c0deae6e63e773d4d8a31f7142a76 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T3.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T3.js
@@ -17,7 +17,6 @@ description: >
     Values of the function constructor arguments are
     "{toString:function(){p=1;return "a";}}" and
     "{toString:function(){throw "body";}}"
-includes: [$FAIL.js]
 ---*/
 
 var p = {toString:function(){p=1;return "a";}};
@@ -26,7 +25,7 @@ var body = {toString:function(){throw "body";}};
 //CHECK#1
 try {
   var f = new Function(p,body);
-  $FAIL('#1: test failed');
+  $ERROR('#1: test failed');
 } catch (e) {
   if (e !== "body") {
   	$ERROR('#1.1: i) Let Result(i) be the first argument; ii) Let P be ToString(Result(i))');
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T4.js b/test/built-ins/Function/S15.3.2.1_A3_T4.js
index 1f26565d278d3ed426dfd2cc45204dacbc67c3c6..8d92d21d2b9cd35f17a7cd5439c590ccce3954e9 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T4.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T4.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T4
 description: >
     Values of the function constructor arguments are an undefined
     variable and "return 1.1;"
-includes: [$FAIL.js]
 ---*/
 
 var body = "return 1.1;";
@@ -25,7 +24,7 @@ var body = "return 1.1;";
 try {
   var f = new Function(p,body);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T5.js b/test/built-ins/Function/S15.3.2.1_A3_T5.js
index b7c6cc0bc37bf69bf7f315f373b88090251589f2..09b12ba1d8543815e3420497e309a090b7ced0c1 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T5.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T5.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T5
 description: >
     Values of the function constructor arguments are "void 0" and
     "return \"A\";"
-includes: [$FAIL.js]
 ---*/
 
 var body = "return \"A\";";
@@ -25,7 +24,7 @@ var body = "return \"A\";";
 try {
   var f = new Function(void 0,body);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T6.js b/test/built-ins/Function/S15.3.2.1_A3_T6.js
index 4837e146e50473de444d5cf0f745467004b3489f..29cd1fa6a0fa2af0feb716cc7a8f87786f69adc9 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T6.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T6.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T6
 description: >
     Values of the function constructor arguments are "null" and
     "return true;"
-includes: [$FAIL.js]
 ---*/
 
 var body = "return true;";
@@ -24,7 +23,7 @@ var body = "return true;";
 //CHECK#1
 try {
   var f = new Function(null,body);
-  $FAIL('#1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
+  $ERROR('#1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
 } catch (e) {
   if (!(e instanceof SyntaxError)) {
   	$ERROR('#1.1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T7.js b/test/built-ins/Function/S15.3.2.1_A3_T7.js
index daa5877f4acaa2259a377c611a0e4e1af9c1d4dc..8d06d86d9f7a3207e532a4f6582082e9faa19810 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T7.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T7.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T7
 description: >
     Values of the function constructor arguments are "Object("a")" and
     "return a;"
-includes: [$FAIL.js]
 ---*/
 
 var body = "return a;";
@@ -27,7 +26,7 @@ var p=Object("a");
 try {
   var f = new Function(p, body);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T8.js b/test/built-ins/Function/S15.3.2.1_A3_T8.js
index 693c2706c9b83fce618849c3934de8738e7f64c2..c5340186cebd75c357ca660a73c5cd5908b0e38f 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T8.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T8.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T8
 description: >
     Values of the function constructor arguments are "undefined" and
     "return this;"
-includes: [$FAIL.js]
 ---*/
 
 var body = "return this;";
@@ -25,7 +24,7 @@ var body = "return this;";
 try {
   var f = new Function(undefined,body);
 } catch (e) {
-  $FAIL('#1: test failed with error '+e);
+  $ERROR('#1: test failed with error '+e);
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/S15.3.2.1_A3_T9.js b/test/built-ins/Function/S15.3.2.1_A3_T9.js
index 9e2dc1ca8b7feece8a5bc1c51ac77f649c2c7d25..0ae6e3d7e28e7d87f4db6f888e8ff1fad24c4d97 100644
--- a/test/built-ins/Function/S15.3.2.1_A3_T9.js
+++ b/test/built-ins/Function/S15.3.2.1_A3_T9.js
@@ -16,7 +16,6 @@ es5id: 15.3.2.1_A3_T9
 description: >
     Values of the function constructor arguments are "1,1" and "return
     this;"
-includes: [$FAIL.js]
 ---*/
 
 var body = "return this;";
@@ -25,7 +24,7 @@ var p="1,1";
 //CHECK#1
 try {
   var f = new Function(p,body);
-  $FAIL('#1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
+  $ERROR('#1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
 } catch (e) {
   if (!(e instanceof SyntaxError)) {
   	$ERROR('#1.1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
diff --git a/test/built-ins/Function/length/S15.3.5.1_A1_T1.js b/test/built-ins/Function/length/S15.3.5.1_A1_T1.js
index 51e57b294e13300c0138acbe88e86c34456e59e1..894b3bb43ea61003f65d01a97fea943466c86526 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A1_T1.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A1_T1.js
@@ -7,14 +7,13 @@ info: >
     'typical' number of arguments expected by the function
 es5id: 15.3.5.1_A1_T1
 description: Checking length property of Function("arg1,arg2,arg3", null)
-includes: [$FAIL.js]
 ---*/
 
 var f = new Function("arg1,arg2,arg3", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/length/S15.3.5.1_A1_T2.js b/test/built-ins/Function/length/S15.3.5.1_A1_T2.js
index b71c78bc5202456cc800d59e15d8147907ba558a..bb7058e4c5f7769bf4fd193ca43721af4bd93bd1 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A1_T2.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A1_T2.js
@@ -9,14 +9,13 @@ es5id: 15.3.5.1_A1_T2
 description: >
     Checking length property of Function("arg1,arg2,arg3","arg4,arg5",
     null)
-includes: [$FAIL.js]
 ---*/
 
 var f = Function("arg1,arg2,arg3","arg4,arg5", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/length/S15.3.5.1_A1_T3.js b/test/built-ins/Function/length/S15.3.5.1_A1_T3.js
index 78d576ec875a314f8d8d40cfca122f25491e9fc1..12bff6443ea831761fb902e285e0376b57b42eb5 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A1_T3.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A1_T3.js
@@ -9,14 +9,13 @@ es5id: 15.3.5.1_A1_T3
 description: >
     Checking length property of
     Function("arg1,arg2,arg3","arg1,arg2","arg3", null)
-includes: [$FAIL.js]
 ---*/
 
 var f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/length/S15.3.5.1_A2_T1.js b/test/built-ins/Function/length/S15.3.5.1_A2_T1.js
index 9151065b8920a0b9954491a3be924a691a27f0f3..ccc4b10436d53309b0321d9acb14e856c955fb9f 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A2_T1.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A2_T1.js
@@ -7,14 +7,13 @@ es5id: 15.3.5.1_A2_T1
 description: >
     Checking if deleting the length property of
     Function("arg1,arg2,arg3", null) succeeds
-includes: [$FAIL.js]
 ---*/
 
 var f = new Function("arg1,arg2,arg3", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 //CHECK#2
diff --git a/test/built-ins/Function/length/S15.3.5.1_A2_T2.js b/test/built-ins/Function/length/S15.3.5.1_A2_T2.js
index 77335fb25fd023ae713cb94e46dfb5ec5a35cc67..7684cd9183ee1fc9657d73de5817e40a5556b336 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A2_T2.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A2_T2.js
@@ -7,14 +7,13 @@ es5id: 15.3.5.1_A2_T2
 description: >
     Checking if deleting the length property of
     Function("arg1,arg2,arg3","arg4,arg5", null) succeeds
-includes: [$FAIL.js]
 ---*/
 
 var f =  Function("arg1,arg2,arg3","arg4,arg5", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 delete f.length;
diff --git a/test/built-ins/Function/length/S15.3.5.1_A2_T3.js b/test/built-ins/Function/length/S15.3.5.1_A2_T3.js
index 553fd94065fcd70e7e3cdc725cc10d4b71b0fa7b..f6503507116dfd84346cd1e11c73b6a2c3b1c676 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A2_T3.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A2_T3.js
@@ -7,14 +7,13 @@ es5id: 15.3.5.1_A2_T3
 description: >
     Checking if deleting the length property of
     Function("arg1,arg2,arg3","arg1,arg2","arg3", null) succeeds
-includes: [$FAIL.js]
 ---*/
 
 var f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 delete f.length;
diff --git a/test/built-ins/Function/length/S15.3.5.1_A3_T1.js b/test/built-ins/Function/length/S15.3.5.1_A3_T1.js
index 6b810fb8c4b180ca1e32c54e34dfabf871d67cb5..c10714b3f41e2486419da1c3732990adf9261404 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A3_T1.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A3_T1.js
@@ -7,14 +7,14 @@ es5id: 15.3.5.1_A3_T1
 description: >
     Checking if varying the length property of
     Function("arg1,arg2,arg3","arg4,arg5", null) fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var f = new Function("arg1,arg2,arg3","arg4,arg5", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 var flength = f.length;
diff --git a/test/built-ins/Function/length/S15.3.5.1_A3_T2.js b/test/built-ins/Function/length/S15.3.5.1_A3_T2.js
index 6ab88a92c072692533fdc2fe43e1abf2ddcf2059..2482faecd131bca421f6f690d9a2fc41f1bb59e2 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A3_T2.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A3_T2.js
@@ -7,14 +7,14 @@ es5id: 15.3.5.1_A3_T2
 description: >
     Checking if varying the length property of
     Function("arg1,arg2,arg3", null) fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var f =  Function("arg1,arg2,arg3", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 var flength = f.length;
diff --git a/test/built-ins/Function/length/S15.3.5.1_A3_T3.js b/test/built-ins/Function/length/S15.3.5.1_A3_T3.js
index 26cfedc3ea13ee04f35d9b902ef9bdec488d1fac..ed321e683d2cfb50a8ac5da455458af7f3f6e53a 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A3_T3.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A3_T3.js
@@ -7,14 +7,14 @@ es5id: 15.3.5.1_A3_T3
 description: >
     Checking if varying the length property of
     Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 var flength = f.length;
diff --git a/test/built-ins/Function/length/S15.3.5.1_A4_T1.js b/test/built-ins/Function/length/S15.3.5.1_A4_T1.js
index f347f4b35a652b135d980c24a65b79f46ccd1edd..14f9cc41041412dc8b02996028a8e06b3d24f617 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A4_T1.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A4_T1.js
@@ -7,14 +7,13 @@ es5id: 15.3.5.1_A4_T1
 description: >
     Checking if enumerating the length property of
     Function("arg1,arg2,arg3", null) fails
-includes: [$FAIL.js]
 ---*/
 
 var f = new Function("arg1,arg2,arg3", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 for(var key in f)
diff --git a/test/built-ins/Function/length/S15.3.5.1_A4_T2.js b/test/built-ins/Function/length/S15.3.5.1_A4_T2.js
index 62a663df8769ff55bc6f3ff5a763780e59245383..c67c5f6a59e8de7524da766d3d09a59a2e58c0b7 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A4_T2.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A4_T2.js
@@ -7,14 +7,13 @@ es5id: 15.3.5.1_A4_T2
 description: >
     Checking if enumerating the length property of
     Function("arg1,arg2,arg3","arg4,arg5", null) fails
-includes: [$FAIL.js]
 ---*/
 
 var f =  Function("arg1,arg2,arg3","arg5,arg4", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 for(var key in f)
diff --git a/test/built-ins/Function/length/S15.3.5.1_A4_T3.js b/test/built-ins/Function/length/S15.3.5.1_A4_T3.js
index 49b33030269b81b8f6fbd94f1669ac9da0c51935..cdf721374c3bf9cc75db29370757691f4a79c5ef 100644
--- a/test/built-ins/Function/length/S15.3.5.1_A4_T3.js
+++ b/test/built-ins/Function/length/S15.3.5.1_A4_T3.js
@@ -7,14 +7,13 @@ es5id: 15.3.5.1_A4_T3
 description: >
     Checking if enumerating the length property of
     Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
-includes: [$FAIL.js]
 ---*/
 
 var f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('length'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 for(var key in f)
diff --git a/test/built-ins/Function/prototype/S15.3.4_A5.js b/test/built-ins/Function/prototype/S15.3.4_A5.js
index 664d35a967cdc4398c3a2575901c78aa2e73c8f8..e691fb2f89330e9fa9f3e6b534bd09f6c9b83a58 100644
--- a/test/built-ins/Function/prototype/S15.3.4_A5.js
+++ b/test/built-ins/Function/prototype/S15.3.4_A5.js
@@ -9,13 +9,12 @@ es5id: 15.3.4_A5
 description: Checking if creating "new Function.prototype object" fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 //CHECK#
 try {
   var obj = new Function.prototype;
-  $FAIL('#1: The Function prototype object is itself a Function object without [[Construct]] property: '+e);
+  $ERROR('#1: The Function prototype object is itself a Function object without [[Construct]] property: '+e);
 } catch (e) {
   $PRINT("#1.1: The Function prototype object is itself a Function object without [[Construct]] property "+e);
 
diff --git a/test/built-ins/Function/prototype/S15.3.5.2_A1_T1.js b/test/built-ins/Function/prototype/S15.3.5.2_A1_T1.js
index 386557b43a618c1e3815bd128c1d12ca6fad5de5..5a68d4a1c708c74e917c86c2de2aaf5f2c219025 100644
--- a/test/built-ins/Function/prototype/S15.3.5.2_A1_T1.js
+++ b/test/built-ins/Function/prototype/S15.3.5.2_A1_T1.js
@@ -7,14 +7,14 @@ es5id: 15.3.5.2_A1_T1
 description: >
     Checking if deleting the prototype property of Function("", null)
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var f = new Function("", null);
 
 //CHECK#1
 if (!(f.hasOwnProperty('prototype'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 var fproto = f.prototype;
diff --git a/test/built-ins/Function/prototype/S15.3.5.2_A1_T2.js b/test/built-ins/Function/prototype/S15.3.5.2_A1_T2.js
index ae3d200c0876f54a29ddb576a8e1d1fc296bd19e..6f1f2974e0f3151c589723fdeb201d85dbe20f2d 100644
--- a/test/built-ins/Function/prototype/S15.3.5.2_A1_T2.js
+++ b/test/built-ins/Function/prototype/S15.3.5.2_A1_T2.js
@@ -7,14 +7,14 @@ es5id: 15.3.5.2_A1_T2
 description: >
     Checking if deleting the prototype property of Function(void 0,
     "") fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var f = Function(void 0, "");
 
 //CHECK#1
 if (!(f.hasOwnProperty('prototype'))) {
-  $FAIL('#1: the function has length property.');
+  $ERROR('#1: the function has length property.');
 }
 
 var fproto = f.prototype;
diff --git a/test/built-ins/Function/prototype/apply/S15.3.4.3_A10.js b/test/built-ins/Function/prototype/apply/S15.3.4.3_A10.js
index 843d3250eee08670e3124d2d1abed99f159e6c39..ce9541aa014de7c19d9044379c1525aa1d5c7036 100644
--- a/test/built-ins/Function/prototype/apply/S15.3.4.3_A10.js
+++ b/test/built-ins/Function/prototype/apply/S15.3.4.3_A10.js
@@ -7,12 +7,12 @@ es5id: 15.3.4.3_A10
 description: >
     Checking if varying the Function.prototype.apply.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
-  $FAIL('#1: the Function.prototype.apply has length property.');
+  $ERROR('#1: the Function.prototype.apply has length property.');
 }
 
 var obj = Function.prototype.apply.length;
diff --git a/test/built-ins/Function/prototype/apply/S15.3.4.3_A11.js b/test/built-ins/Function/prototype/apply/S15.3.4.3_A11.js
index 02a5ca95f62e84ab50061fdfb43820fc3c0199fa..18da556b62a4694eb717e3264755b649a7d6ed4c 100644
--- a/test/built-ins/Function/prototype/apply/S15.3.4.3_A11.js
+++ b/test/built-ins/Function/prototype/apply/S15.3.4.3_A11.js
@@ -7,12 +7,11 @@ es5id: 15.3.4.3_A11
 description: >
     TChecking if enumerating the Function.prototype.apply.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
-  $FAIL('#0: the Function.prototype.apply has length property.');
+  $ERROR('#0: the Function.prototype.apply has length property.');
 }
 
 
diff --git a/test/built-ins/Function/prototype/apply/S15.3.4.3_A16.js b/test/built-ins/Function/prototype/apply/S15.3.4.3_A16.js
index 257801885bbc9d0c35e52cc771f62069d861b7ba..ce11c7e88a209ae02f1ae1b0ba96f9918554c258 100644
--- a/test/built-ins/Function/prototype/apply/S15.3.4.3_A16.js
+++ b/test/built-ins/Function/prototype/apply/S15.3.4.3_A16.js
@@ -8,7 +8,6 @@ description: >
     A RegExp is not a function, but it may be callable. Iff it is,
     it's typeof should be 'function', in which case apply should
     accept it as a valid this value.
-includes: [$FAIL.js]
 ---*/
 
 var re = (/x/);
@@ -17,7 +16,7 @@ if (typeof re === 'function') {
 } else {
   try {
     Function.prototype.bind.call(re, undefined);
-    $FAIL('#1: If IsCallable(func) is false, ' +
+    $ERROR('#1: If IsCallable(func) is false, ' +
           'then (bind should) throw a TypeError exception');
   } catch (e) {
     if (!(e instanceof TypeError)) {
diff --git a/test/built-ins/Function/prototype/apply/S15.3.4.3_A1_T1.js b/test/built-ins/Function/prototype/apply/S15.3.4.3_A1_T1.js
index 800dbdaa08a7df93a868404edb36e90b87aa7b51..e926ec76e0cb512f4cd837295ae02c03a5d92fe8 100644
--- a/test/built-ins/Function/prototype/apply/S15.3.4.3_A1_T1.js
+++ b/test/built-ins/Function/prototype/apply/S15.3.4.3_A1_T1.js
@@ -10,7 +10,6 @@ es5id: 15.3.4.3_A1_T1
 description: >
     Calling "apply" method of the object that does not have a [[Call]]
     property.  Prototype of the object is Function()
-includes: [$FAIL.js]
 ---*/
 
 var proto=Function();
@@ -29,7 +28,7 @@ if (typeof obj.apply !== "function") {
 //CHECK#2
 try {
   obj.apply();
-  $FAIL('#2: If the object does not have a [[Call]] property, a TypeError exception is thrown');
+  $ERROR('#2: If the object does not have a [[Call]] property, a TypeError exception is thrown');
 } catch (e) {
   if (!(e instanceof TypeError)) {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
diff --git a/test/built-ins/Function/prototype/apply/S15.3.4.3_A1_T2.js b/test/built-ins/Function/prototype/apply/S15.3.4.3_A1_T2.js
index ae07e58381c99bef884659a2316c84b236afdc07..3f091e96d56efbb250dcbfd01919a4bd399ac7e9 100644
--- a/test/built-ins/Function/prototype/apply/S15.3.4.3_A1_T2.js
+++ b/test/built-ins/Function/prototype/apply/S15.3.4.3_A1_T2.js
@@ -10,7 +10,6 @@ es5id: 15.3.4.3_A1_T2
 description: >
     Calling "apply" method of the object that does not have a [[Call]]
     property.  Prototype of the object is Function.prototype
-includes: [$FAIL.js]
 ---*/
 
 function FACTORY(){};
@@ -27,7 +26,7 @@ if (typeof obj.apply !== "function") {
 //CHECK#2
 try {
   obj.apply();
-  $FAIL('#2: If the object does not have a [[Call]] property, a TypeError exception is thrown');
+  $ERROR('#2: If the object does not have a [[Call]] property, a TypeError exception is thrown');
 } catch (e) {
   if (!(e instanceof TypeError)) {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
diff --git a/test/built-ins/Function/prototype/apply/S15.3.4.3_A6_T2.js b/test/built-ins/Function/prototype/apply/S15.3.4.3_A6_T2.js
index 62f597c8df278f4f29beaa0f5e0fde2682c29646..707448857830324f3514d31594d5bda83c93ced2 100644
--- a/test/built-ins/Function/prototype/apply/S15.3.4.3_A6_T2.js
+++ b/test/built-ins/Function/prototype/apply/S15.3.4.3_A6_T2.js
@@ -7,13 +7,12 @@ info: >
     TypeError exception is thrown
 es5id: 15.3.4.3_A6_T2
 description: argArray is (null,1)
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Function().apply(null,1);
-  $FAIL('#1: if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown');
+  $ERROR('#1: if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown');
 } catch (e) {
   if (!(e instanceof TypeError)) {
   	$ERROR('#1.1: if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown');
diff --git a/test/built-ins/Function/prototype/apply/S15.3.4.3_A6_T3.js b/test/built-ins/Function/prototype/apply/S15.3.4.3_A6_T3.js
index 55d32577b0071d6c65d586f2c1e0a3dfc2b4607c..7484bc375faeea86ce93f651803473f99a2eaf20 100644
--- a/test/built-ins/Function/prototype/apply/S15.3.4.3_A6_T3.js
+++ b/test/built-ins/Function/prototype/apply/S15.3.4.3_A6_T3.js
@@ -7,7 +7,6 @@ info: >
     TypeError exception is thrown
 es5id: 15.3.4.3_A6_T3
 description: argArray is (object,"1,3,4")
-includes: [$FAIL.js]
 ---*/
 
 var obj={};
@@ -15,7 +14,7 @@ var obj={};
 //CHECK#1
 try {
   Function().apply(obj,"1,3,4");
-  $FAIL('#1: if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown');
+  $ERROR('#1: if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown');
 } catch (e) {
   if (!(e instanceof TypeError)) {
   	$ERROR('#1.1: if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown');
diff --git a/test/built-ins/Function/prototype/apply/S15.3.4.3_A9.js b/test/built-ins/Function/prototype/apply/S15.3.4.3_A9.js
index 5d578503bcb280122ae1469d44d3f17840efe484..f85be93919f17c367663eeab682ebf251839ab73 100644
--- a/test/built-ins/Function/prototype/apply/S15.3.4.3_A9.js
+++ b/test/built-ins/Function/prototype/apply/S15.3.4.3_A9.js
@@ -9,12 +9,11 @@ es5id: 15.3.4.3_A9
 description: >
     Checking if deleting the Function.prototype.apply.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
-  $FAIL('#0: the Function.prototype.apply has length property');
+  $ERROR('#0: the Function.prototype.apply has length property');
 }
 
 //CHECK#1
@@ -24,5 +23,5 @@ if (!delete Function.prototype.apply.length) {
 
 //CHECK#2
 if (Function.prototype.apply.hasOwnProperty('length')) {
-  $FAIL('#2: The Function.prototype.apply.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Function.prototype.apply.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Function/prototype/bind/S15.3.4.5_A16.js b/test/built-ins/Function/prototype/bind/S15.3.4.5_A16.js
index 53b26df697006644cc62a68e0bb65aa071352a63..92d5f82d8f8e211d9d9d3c76a0174990893106f9 100644
--- a/test/built-ins/Function/prototype/bind/S15.3.4.5_A16.js
+++ b/test/built-ins/Function/prototype/bind/S15.3.4.5_A16.js
@@ -8,7 +8,6 @@ description: >
     A RegExp is not a function, but it may be callable. Iff it is,
     it's typeof should be 'function', in which case bind should accept
     it as a valid this value.
-includes: [$FAIL.js]
 ---*/
 
 var re = (/x/);
@@ -17,7 +16,7 @@ if (typeof re === 'function') {
 } else {
   try {
     Function.prototype.bind.call(re, undefined);
-    $FAIL('#1: If IsCallable(func) is false, ' +
+    $ERROR('#1: If IsCallable(func) is false, ' +
           'then (bind should) throw a TypeError exception');
   } catch (e) {
     if (!(e instanceof TypeError)) {
diff --git a/test/built-ins/Function/prototype/call/S15.3.4.4_A10.js b/test/built-ins/Function/prototype/call/S15.3.4.4_A10.js
index a2be8f05808a38b57eeae63fb2cc02810a8615c5..dd8819d49b15ba6e63866103541a6b0cef2d81b3 100644
--- a/test/built-ins/Function/prototype/call/S15.3.4.4_A10.js
+++ b/test/built-ins/Function/prototype/call/S15.3.4.4_A10.js
@@ -7,12 +7,12 @@ es5id: 15.3.4.4_A10
 description: >
     Checking if varying the Function.prototype.call.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
-  $FAIL('#1: the Function.prototype.call has length property.');
+  $ERROR('#1: the Function.prototype.call has length property.');
 }
 
 var obj = Function.prototype.call.length;
diff --git a/test/built-ins/Function/prototype/call/S15.3.4.4_A11.js b/test/built-ins/Function/prototype/call/S15.3.4.4_A11.js
index ab7f680ef5aa34b14cd59406d0604c185a17ac0f..c9be0531d247833931d92985e7a45766cd29a504 100644
--- a/test/built-ins/Function/prototype/call/S15.3.4.4_A11.js
+++ b/test/built-ins/Function/prototype/call/S15.3.4.4_A11.js
@@ -7,12 +7,11 @@ es5id: 15.3.4.4_A11
 description: >
     Checking if enumerating the Function.prototype.call.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
-  $FAIL('#0: the Function.prototype.call has length property.');
+  $ERROR('#0: the Function.prototype.call has length property.');
 }
 
 
diff --git a/test/built-ins/Function/prototype/call/S15.3.4.4_A16.js b/test/built-ins/Function/prototype/call/S15.3.4.4_A16.js
index 96e1a1623782e8cda8601d6a88abbde9821b7866..2bde783ddc2ee0a6bf599bc35a6bf1ae0386bcf6 100644
--- a/test/built-ins/Function/prototype/call/S15.3.4.4_A16.js
+++ b/test/built-ins/Function/prototype/call/S15.3.4.4_A16.js
@@ -8,7 +8,6 @@ description: >
     A RegExp is not a function, but it may be callable. Iff it is,
     it's typeof should be 'function', in which case call should accept
     it as a valid this value.
-includes: [$FAIL.js]
 ---*/
 
 var re = (/x/);
@@ -17,7 +16,7 @@ if (typeof re === 'function') {
 } else {
   try {
     Function.prototype.bind.call(re, undefined);
-    $FAIL('#1: If IsCallable(func) is false, ' +
+    $ERROR('#1: If IsCallable(func) is false, ' +
           'then (bind should) throw a TypeError exception');
   } catch (e) {
     if (!(e instanceof TypeError)) {
diff --git a/test/built-ins/Function/prototype/call/S15.3.4.4_A1_T1.js b/test/built-ins/Function/prototype/call/S15.3.4.4_A1_T1.js
index a4f7da20f915db87487620d76c0a1b08fb7fd064..85f2727a9dac21d27388b0693e910159e0e031ef 100644
--- a/test/built-ins/Function/prototype/call/S15.3.4.4_A1_T1.js
+++ b/test/built-ins/Function/prototype/call/S15.3.4.4_A1_T1.js
@@ -10,7 +10,6 @@ es5id: 15.3.4.4_A1_T1
 description: >
     Call "call" method of the object that does not have a [[Call]]
     property.  Prototype of the object is Function()
-includes: [$FAIL.js]
 ---*/
 
 var proto=Function();
@@ -29,7 +28,7 @@ if (typeof obj.call !== "function") {
 //CHECK#2
 try {
   obj.call();
-  $FAIL('#2: If the object does not have a [[Call]] property, a TypeError exception is thrown');
+  $ERROR('#2: If the object does not have a [[Call]] property, a TypeError exception is thrown');
 } catch (e) {
   if (!(e instanceof TypeError)) {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
diff --git a/test/built-ins/Function/prototype/call/S15.3.4.4_A1_T2.js b/test/built-ins/Function/prototype/call/S15.3.4.4_A1_T2.js
index 44c00bbc18bc9a2ead66f9ecd8bdb0006e57da25..5a576a826237a72384365a3661f50e6af411b040 100644
--- a/test/built-ins/Function/prototype/call/S15.3.4.4_A1_T2.js
+++ b/test/built-ins/Function/prototype/call/S15.3.4.4_A1_T2.js
@@ -10,7 +10,6 @@ es5id: 15.3.4.4_A1_T2
 description: >
     Calling "call" method of the object that does not have a [[Call]]
     property.  Prototype of the object is Function.prototype
-includes: [$FAIL.js]
 ---*/
 
 function FACTORY(){};
@@ -27,7 +26,7 @@ if (typeof obj.call !== "function") {
 //CHECK#2
 try {
   obj.call();
-  $FAIL('#2: If the object does not have a [[Call]] property, a TypeError exception is thrown');
+  $ERROR('#2: If the object does not have a [[Call]] property, a TypeError exception is thrown');
 } catch (e) {
   if (!(e instanceof TypeError)) {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
diff --git a/test/built-ins/Function/prototype/call/S15.3.4.4_A9.js b/test/built-ins/Function/prototype/call/S15.3.4.4_A9.js
index a94a21255eaa9516143d6aad58178d56e35396df..5674599a1d1a6a1eea1b0c06112f877a555c2613 100644
--- a/test/built-ins/Function/prototype/call/S15.3.4.4_A9.js
+++ b/test/built-ins/Function/prototype/call/S15.3.4.4_A9.js
@@ -9,12 +9,11 @@ es5id: 15.3.4.4_A9
 description: >
     Checking if deleting the Function.prototype.call.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
-  $FAIL('#0: the Function.prototype.call has length property');
+  $ERROR('#0: the Function.prototype.call has length property');
 }
 
 //CHECK#1
@@ -24,5 +23,5 @@ if (!delete Function.prototype.call.length) {
 
 //CHECK#2
 if (Function.prototype.call.hasOwnProperty('length')) {
-  $FAIL('#2: The Function.prototype.call.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Function.prototype.call.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Function/prototype/toString/S15.3.4.2_A10.js b/test/built-ins/Function/prototype/toString/S15.3.4.2_A10.js
index 509f75b2c3786f87081c1abfbf6b8b2d9cc8b3a4..7391b67ed71cba6fe5abf41e929bbca4e07eb3f1 100644
--- a/test/built-ins/Function/prototype/toString/S15.3.4.2_A10.js
+++ b/test/built-ins/Function/prototype/toString/S15.3.4.2_A10.js
@@ -7,12 +7,12 @@ es5id: 15.3.4.2_A10
 description: >
     Checking if varying the Function.prototype.toString.length
     property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
-  $FAIL('#1: the Function.prototype.toString has length property.');
+  $ERROR('#1: the Function.prototype.toString has length property.');
 }
 
 var obj = Function.prototype.toString.length;
diff --git a/test/built-ins/Function/prototype/toString/S15.3.4.2_A7.js b/test/built-ins/Function/prototype/toString/S15.3.4.2_A7.js
index 26fe9ccd9452a9f2fa273edd3716513559873754..c6d46fcae205f0635a37081593773adf772da3a2 100644
--- a/test/built-ins/Function/prototype/toString/S15.3.4.2_A7.js
+++ b/test/built-ins/Function/prototype/toString/S15.3.4.2_A7.js
@@ -7,14 +7,13 @@ es5id: 15.3.4.2_A7
 description: Checking if creating "new Function.prototype.toString" fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var FACTORY = Function.prototype.toString;
 
 try {
   var instance = new FACTORY;
-  $FAIL('#1: Function.prototype.toString can\'t be used as constructor');
+  $ERROR('#1: Function.prototype.toString can\'t be used as constructor');
 } catch (e) {
   $PRINT(e);
 }
diff --git a/test/built-ins/Function/prototype/toString/S15.3.4.2_A8.js b/test/built-ins/Function/prototype/toString/S15.3.4.2_A8.js
index 47cd4efcc3fdd5ce60e6ff4edd727d2a8025e029..b730a6ec2f1246fe7096d0e8a3f0a350cf25a194 100644
--- a/test/built-ins/Function/prototype/toString/S15.3.4.2_A8.js
+++ b/test/built-ins/Function/prototype/toString/S15.3.4.2_A8.js
@@ -7,12 +7,11 @@ es5id: 15.3.4.2_A8
 description: >
     Checking if enumerating the Function.prototype.toString.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
-  $FAIL('#0: the Function.prototype.toString has length property.');
+  $ERROR('#0: the Function.prototype.toString has length property.');
 }
 
 
diff --git a/test/built-ins/Function/prototype/toString/S15.3.4.2_A9.js b/test/built-ins/Function/prototype/toString/S15.3.4.2_A9.js
index d5373305da05d8a7d35a02a0082a6af0e57ca5d1..04ef032aa2735758b5f8ae0318b8112d0b82521f 100644
--- a/test/built-ins/Function/prototype/toString/S15.3.4.2_A9.js
+++ b/test/built-ins/Function/prototype/toString/S15.3.4.2_A9.js
@@ -9,12 +9,11 @@ es5id: 15.3.4.2_A9
 description: >
     Checking if deleting the Function.prototype.toString.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
-  $FAIL('#0: the Function.prototype.toString has length property');
+  $ERROR('#0: the Function.prototype.toString has length property');
 }
 
 //CHECK#1
@@ -24,5 +23,5 @@ if (!delete Function.prototype.toString.length) {
 
 //CHECK#2
 if (Function.prototype.toString.hasOwnProperty('length')) {
-  $FAIL('#2: The Function.prototype.toString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Function.prototype.toString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/JSON/parse/S15.12.2_A1.js b/test/built-ins/JSON/parse/S15.12.2_A1.js
index 6f195217cd75f7ec084cb13b9d95b4105751f68e..fc44724d607303f8ec5465b5b219f169632c4afb 100644
--- a/test/built-ins/JSON/parse/S15.12.2_A1.js
+++ b/test/built-ins/JSON/parse/S15.12.2_A1.js
@@ -5,13 +5,12 @@
 info: JSON.parse must create a property with the given property name
 es5id: 15.12.2_A1
 description: Tests that JSON.parse treats "__proto__" as a regular property name
-includes: [$FAIL.js]
 ---*/
 
 var x = JSON.parse('{"__proto__":[]}');
 if (Object.getPrototypeOf(x) !== Object.prototype) {
-  $FAIL('#1: JSON.parse confused by "__proto__"');
+  $ERROR('#1: JSON.parse confused by "__proto__"');
 }
 if (!Array.isArray(x.__proto__)) {
-  $FAIL('#2: JSON.parse did not set "__proto__" as a regular property');
+  $ERROR('#2: JSON.parse did not set "__proto__" as a regular property');
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A11.js b/test/built-ins/Math/atan2/S15.8.2.5_A11.js
index c9e2badee19705a9a61984bc15a3a74c56e758cb..a499f7aa09154533aa8861771cee4ed5656a81b0 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A11.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A11.js
@@ -8,7 +8,6 @@ info: >
 es5id: 15.8.2.5_A11
 description: Checking if Math.atan2(-0,x) is an approximation to -PI, where x<0
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -25,5 +24,5 @@ var xnum = 3;
 for (var i = 0; i < xnum; i++)
 {
 	if (!isEqual(Math.atan2(y,x[i]), - Math.PI))
-		$FAIL("#1: Math.abs(Math.atan2(" + y + ", " + x[i] + ") + Math.PI) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y + ", " + x[i] + ") + Math.PI) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A12.js b/test/built-ins/Math/atan2/S15.8.2.5_A12.js
index 8186d6fc06e029907c47e4fc4d979ef44da53a1d..3a8fcd91862d3f5452f16022256e354dc87f4025 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A12.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A12.js
@@ -10,7 +10,6 @@ description: >
     Checking if Math.atan2(y,+0) is an approximation to -PI/2, where
     y<0
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -27,5 +26,5 @@ var ynum = 3;
 for (var i = 0; i < ynum; i++)
 {
 	if (!isEqual(Math.atan2(y[i],x), -(Math.PI)/2))
-		$FAIL("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") + ((Math.PI)/2)) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") + ((Math.PI)/2)) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A13.js b/test/built-ins/Math/atan2/S15.8.2.5_A13.js
index 714f454e22aa05213df292f9d491284bc469ce99..4c4829a0841a1f3b81b936815dd0d5af5b0a3f38 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A13.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A13.js
@@ -10,7 +10,6 @@ description: >
     Checking if Math.atan2(y,-0) is an approximation to -PI/2, where
     y<0
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -27,5 +26,5 @@ var ynum = 3;
 for (var i = 0; i < ynum; i++)
 {
 	if (!isEqual(Math.atan2(y[i],x), -(Math.PI)/2))
-		$FAIL("#1: Math.abs(Math.atan2(" + y[i] + ", -0) + ((Math.PI)/2)) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y[i] + ", -0) + ((Math.PI)/2)) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A14.js b/test/built-ins/Math/atan2/S15.8.2.5_A14.js
index 4555ef41e01b6381f478337f99091bb477db0bbb..1827f23f30728179e9684d8df9cd7ea89ba41be1 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A14.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A14.js
@@ -7,7 +7,6 @@ es5id: 15.8.2.5_A14
 description: >
     Checking if Math.atan2(y,x) equals to +0, where y>0 and y is
     finite and x is equal to +Infinity
-includes: [$FAIL.js]
 ---*/
 
 // CHECK#1
@@ -21,5 +20,5 @@ var ynum = 3;
 for (var i = 0; i < ynum; i++)
 {
 	if (Math.atan2(y[i],x) !== +0)
-		$FAIL("#1: Math.atan2(" + y[i] + ", " + x + ") !== +0");
+		$ERROR("#1: Math.atan2(" + y[i] + ", " + x + ") !== +0");
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A15.js b/test/built-ins/Math/atan2/S15.8.2.5_A15.js
index 05268dec2ca8190995df762de5722aaf71720f2b..4ddfb401ad38b47b12142dda5a77ea0c1cbcaeac 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A15.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A15.js
@@ -10,7 +10,6 @@ description: >
     Checking if Math.atan2(y,x) is an approximation to +PI, where y>0
     and y is finite and x is equal to -Infinity
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -26,5 +25,5 @@ var ynum = 3;
 for (var i = 0; i < ynum; i++)
 {
 	if (!isEqual(Math.atan2(y[i],x),Math.PI))
-		$FAIL("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") - Math.PI) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") - Math.PI) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A16.js b/test/built-ins/Math/atan2/S15.8.2.5_A16.js
index 5abc19b3097a43a89e56354ad012b9112557b2c2..4fb2ba1195556087ba01442a14bbd8b7705adbc3 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A16.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A16.js
@@ -7,7 +7,6 @@ es5id: 15.8.2.5_A16
 description: >
     Checking if Math.atan2(y,x) is -0, where y<0 and y is finite and x
     is equal to +Infinity
-includes: [$FAIL.js]
 ---*/
 
 // CHECK#1
@@ -21,5 +20,5 @@ var ynum = 3;
 for (var i = 0; i < ynum; i++)
 {
 	if (Math.atan2(y[i],x) !== -0)
-		$FAIL("#1: Math.atan2(" + y[i] + ", " + x + ") !== -0");
+		$ERROR("#1: Math.atan2(" + y[i] + ", " + x + ") !== -0");
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A17.js b/test/built-ins/Math/atan2/S15.8.2.5_A17.js
index c7bf3f18464b6a5b237989c56434e99788717b6b..0648d750c12cc41fcf565c2e8c8b728551eacbbb 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A17.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A17.js
@@ -10,7 +10,6 @@ description: >
     Checking if Math.atan2(y,x) is an approximation to -PI, where y<0
     and y is finite and x is equal to -Infinity
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -26,5 +25,5 @@ var ynum = 3;
 for (var i = 0; i < ynum; i++)
 {
 	if (!isEqual(Math.atan2(y[i],x), -Math.PI))
-		$FAIL("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") + Math.PI) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") + Math.PI) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A18.js b/test/built-ins/Math/atan2/S15.8.2.5_A18.js
index 5c90242f0b7840cabfbd67552459cb2c91a8d27b..294e1774727ea469e32a7557857f85ef502113eb 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A18.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A18.js
@@ -10,7 +10,6 @@ description: >
     Checking if Math.atan2(y,x) is an approximation to +PI/2, where y
     is +Infinity and x is finite
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -30,5 +29,5 @@ var xnum = 6;
 for (var i = 0; i < xnum; i++)
 {
 	if (!isEqual(Math.atan2(y,x[i]), (Math.PI)/2))
-		$FAIL("#1: Math.abs(Math.atan2(" + y + ", " + x[i] + ") - (Math.PI/2)) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y + ", " + x[i] + ") - (Math.PI/2)) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A19.js b/test/built-ins/Math/atan2/S15.8.2.5_A19.js
index 36c796505d6aef43435d516ddcfa169e0ddcd9fe..92c559fbf6ddcf60fae9008b77f22eaea4f1f47a 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A19.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A19.js
@@ -10,7 +10,6 @@ description: >
     Checking if Math.atan2(y,x) is an approximation to -PI/2, where y
     is -Infinity and x is finite
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -31,5 +30,5 @@ var xnum = 6;
 for (var i = 0; i < xnum; i++)
 {
 	if (!isEqual(Math.atan2(y,x[i]), -(Math.PI)/2))
-		$FAIL("#1: Math.abs(Math.atan2(" + y + ", " + x[i] + ") + (Math.PI/2)) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y + ", " + x[i] + ") + (Math.PI/2)) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A2.js b/test/built-ins/Math/atan2/S15.8.2.5_A2.js
index 6402b573aece3e22200d8b0f725770dbdc6db2c6..d51ac1b26fb832abe16f8002a364056857cd26a2 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A2.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A2.js
@@ -10,7 +10,6 @@ description: >
     Checking if Math.atan2(y,x) is an approximation to +PI/2, where
     y>0 and x is +0
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -27,5 +26,5 @@ var ynum = 3;
 for (var i = 0; i < ynum; i++)
 {
 	if (!isEqual(Math.atan2(y[i],x),(Math.PI)/2))
-		$FAIL("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") - ((Math.PI)/2)) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") - ((Math.PI)/2)) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A3.js b/test/built-ins/Math/atan2/S15.8.2.5_A3.js
index 82250173488e02fc34a3babbc9c3a084c461aa09..5ead1cc7b5a4a453b9634ac74fdbe39f42606cbf 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A3.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A3.js
@@ -10,7 +10,6 @@ description: >
     Checking if Math.atan2(y,x) is an approximation to +PI/2, where
     y>0 and x is -0
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -27,5 +26,5 @@ var ynum = 3;
 for (var i = 0; i < ynum; i++)
 {
 	if (!isEqual(Math.atan2(y[i],x), (Math.PI)/2))
-		$FAIL("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") - ((Math.PI)/2)) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y[i] + ", " + x + ") - ((Math.PI)/2)) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A4.js b/test/built-ins/Math/atan2/S15.8.2.5_A4.js
index 71ffcb65d8b2e486bdf87f7f89a309dc8dfc68f3..ce1101ad1ca55b48251bea9259f5bf547db3aec7 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A4.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A4.js
@@ -5,7 +5,6 @@
 info: If y is +0 and x>0, Math.atan2(y,x) is +0
 es5id: 15.8.2.5_A4
 description: Checking if Math.atan2(y,x) equals to +0, where y is +0 and x>0
-includes: [$FAIL.js]
 ---*/
 
 // CHECK#1
@@ -19,5 +18,5 @@ var xnum = 3;
 for (var i = 0; i < xnum; i++)
 {
 	if (Math.atan2(y,x[i]) !== +0)
-		$FAIL("#1: Math.atan2(" + y + ", " + x[i] + ") !== +0");
+		$ERROR("#1: Math.atan2(" + y + ", " + x[i] + ") !== +0");
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A7.js b/test/built-ins/Math/atan2/S15.8.2.5_A7.js
index 4c78dba298c4bc173d6831b7bb7885a9f30077eb..992cc39e0a8967d9ebfbd708f1259680186439e7 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A7.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A7.js
@@ -10,7 +10,6 @@ description: >
     Checking if Math.atan2(y,x) is an approximation to +PI, where y is
     equal to +0 and x<0
 includes:
-    - $FAIL.js
     - math_precision.js
     - math_isequal.js
 ---*/
@@ -27,5 +26,5 @@ var xnum = 3;
 for (var i = 0; i < xnum; i++)
 {
 	if (!isEqual(Math.atan2(y,x[i]), Math.PI))
-		$FAIL("#1: Math.abs(Math.atan2(" + y + ", " + x[i] + ") - Math.PI) >= " + prec);
+		$ERROR("#1: Math.abs(Math.atan2(" + y + ", " + x[i] + ") - Math.PI) >= " + prec);
 }
diff --git a/test/built-ins/Math/atan2/S15.8.2.5_A8.js b/test/built-ins/Math/atan2/S15.8.2.5_A8.js
index a7bd6a1336f47e4ce8d8cf3eecce5ad1e77cb972..d7eb8357945b87a432af99198094a640c359bb03 100644
--- a/test/built-ins/Math/atan2/S15.8.2.5_A8.js
+++ b/test/built-ins/Math/atan2/S15.8.2.5_A8.js
@@ -5,7 +5,6 @@
 info: If y is equal to -0 and x>0, Math.atan2(y,x) is -0
 es5id: 15.8.2.5_A8
 description: Checking if Math.atan2(y,x) is -0, where y is equal to -0 and x>0
-includes: [$FAIL.js]
 ---*/
 
 // CHECK#1
@@ -19,5 +18,5 @@ var xnum = 3;
 for (var i = 0; i < xnum; i++)
 {
 	if (Math.atan2(y,x[i]) !== -0)
-		$FAIL("#1: Math.atan2(" + y + ", " + x[i] + ") !== -0");
+		$ERROR("#1: Math.atan2(" + y + ", " + x[i] + ") !== -0");
 }
diff --git a/test/built-ins/Math/cos/S15.8.2.7_A6.js b/test/built-ins/Math/cos/S15.8.2.7_A6.js
index 366f2d2736e12dfe3637bd15f61dbaadabeed94d..55d54d0abcefd97a841f7f256336010a7f62e609 100644
--- a/test/built-ins/Math/cos/S15.8.2.7_A6.js
+++ b/test/built-ins/Math/cos/S15.8.2.7_A6.js
@@ -8,7 +8,6 @@ description: >
     Checking if Math.cos(x) equals to Math.cos(x+n*2*Math.PI) with
     precision 0.000000000003, where n is an integer from 1 to 100 and
     x is one of 10 float point values from -Math.PI to +Math.PI
-includes: [$FAIL.js]
 ---*/
 
 // CHECK#1
@@ -42,7 +41,7 @@ for (i = 0; i < snum; i++)
 		j++;
 		if (Math.abs(Math.cos(curx) - curval) >= prec)
 		{
-			$FAIL("#1: cos is found out to not be periodic:\n Math.abs(Math.cos(" + x[i] + ") - Math.cos(" + x[i] + " + 2*Math.PI*" + j + ")) >= " + prec + "\n Math.cos(" + x[i] + ") === " + curval + "\n Math.cos(" + curx + ") === " + Math.cos(curx));
+			$ERROR("#1: cos is found out to not be periodic:\n Math.abs(Math.cos(" + x[i] + ") - Math.cos(" + x[i] + " + 2*Math.PI*" + j + ")) >= " + prec + "\n Math.cos(" + x[i] + ") === " + curval + "\n Math.cos(" + curx + ") === " + Math.cos(curx));
 		}
 	}
 }
diff --git a/test/built-ins/Math/pow/S15.8.2.13_A7.js b/test/built-ins/Math/pow/S15.8.2.13_A7.js
index 787b077a96602a4f70fdc3abe7e4a4ecd9a625c6..ba602683143bc4ac3a28c585f256efd9cbb26e3c 100644
--- a/test/built-ins/Math/pow/S15.8.2.13_A7.js
+++ b/test/built-ins/Math/pow/S15.8.2.13_A7.js
@@ -7,7 +7,6 @@ es5id: 15.8.2.13_A7
 description: >
     Checking if Math.pow(x,y) is NaN, where abs(x)==1 and y is
     +Infinity
-includes: [$FAIL.js]
 ---*/
 
 // CHECK#1
@@ -22,6 +21,6 @@ for (var i = 0; i < xnum; i++)
 {
 	if (!isNaN(Math.pow(x[i],y)))
 	{
-		$FAIL("#1: isNaN(Math.pow(" + x[i] + ", " + y + ")) === false");
+		$ERROR("#1: isNaN(Math.pow(" + x[i] + ", " + y + ")) === false");
 	}
 }
diff --git a/test/built-ins/Math/pow/S15.8.2.13_A8.js b/test/built-ins/Math/pow/S15.8.2.13_A8.js
index ebb9f2f72c173e4d99e614023ee7d4246c1ea776..78a0ef77154b3b414c2247b0b579ae0245bc3ae7 100644
--- a/test/built-ins/Math/pow/S15.8.2.13_A8.js
+++ b/test/built-ins/Math/pow/S15.8.2.13_A8.js
@@ -7,7 +7,6 @@ es5id: 15.8.2.13_A8
 description: >
     Checking if Math.pow(x,y) is NaN, where abs(x)==1 and y is
     -Infinity
-includes: [$FAIL.js]
 ---*/
 
 // CHECK#1
@@ -22,6 +21,6 @@ for (var i = 0; i < xnum; i++)
 {
 	if (!isNaN(Math.pow(x[i],y)))
 	{
-		$FAIL("#1: isNaN(Math.pow(" + x[i] + ", " + y + ")) === false");
+		$ERROR("#1: isNaN(Math.pow(" + x[i] + ", " + y + ")) === false");
 	}
 }
diff --git a/test/built-ins/Math/sin/S15.8.2.16_A6.js b/test/built-ins/Math/sin/S15.8.2.16_A6.js
index 27d24478a4b8b3b8f8344a445151b85618f972ee..e982dec1b8b1ad7e4c3c29a29822b528c96cb58d 100644
--- a/test/built-ins/Math/sin/S15.8.2.16_A6.js
+++ b/test/built-ins/Math/sin/S15.8.2.16_A6.js
@@ -8,7 +8,6 @@ description: >
     Checking if Math.sin(x) equals to Math.sin(x+n*2*Math.PI) with
     precision 0.000000000003, where n is an integer from 1 to 100 and
     x is one of 10 float point values from 0 to 2*Math.PI
-includes: [$FAIL.js]
 ---*/
 
 // CHECK#1
@@ -42,7 +41,7 @@ for (i = 0; i < snum; i++)
 		j++;
 		if (Math.abs(Math.sin(curx) - curval) >= prec)
 		{
-			$FAIL("#1: sin is found out to not be periodic:\n Math.abs(Math.sin(" + x[i] + ") - Math.sin(" + x[i] + " + 2*Math.PI*" + j + ")) >= " + prec + "\n Math.sin(" + x[i] + ") === " + curval + "\n Math.sin(" + curx + ") === " + Math.sin(curx));
+			$ERROR("#1: sin is found out to not be periodic:\n Math.abs(Math.sin(" + x[i] + ") - Math.sin(" + x[i] + " + 2*Math.PI*" + j + ")) >= " + prec + "\n Math.sin(" + x[i] + ") === " + curval + "\n Math.sin(" + curx + ") === " + Math.sin(curx));
 		}
 	}
 }
diff --git a/test/built-ins/Math/tan/S15.8.2.18_A6.js b/test/built-ins/Math/tan/S15.8.2.18_A6.js
index 2d0da43b8608e4eec4f63c30d7b61d0d80ee15b6..c3484066b0c2a9bca34d77665accb0eb85c6579d 100644
--- a/test/built-ins/Math/tan/S15.8.2.18_A6.js
+++ b/test/built-ins/Math/tan/S15.8.2.18_A6.js
@@ -8,7 +8,6 @@ description: >
     Checking if Math.tan(x) equals to Math.tan(x+n*Math.PI) with
     precision 0.000000000003, where n is an integer from 1 to 100 and
     x is one of 10 float point values from 0 to Math.PI
-includes: [$FAIL.js]
 ---*/
 
 // CHECK#1
@@ -42,7 +41,7 @@ for (i = 0; i < snum; i++)
 		j++;
 		if (Math.abs(Math.tan(curx) - curval) >= prec)
 		{
-			$FAIL("#1: tan is found out to not be periodic:\n Math.abs(Math.tan(" + x[i] + ") - Math.tan(" + x[i] + " + 2*Math.PI*" + j + ")) >= " + prec + "\n Math.tan(" + x[i] + ") === " + curval + "\n Math.tan(" + curx + ") === " + Math.tan(curx));
+			$ERROR("#1: tan is found out to not be periodic:\n Math.abs(Math.tan(" + x[i] + ") - Math.tan(" + x[i] + " + 2*Math.PI*" + j + ")) >= " + prec + "\n Math.tan(" + x[i] + ") === " + curval + "\n Math.tan(" + curx + ") === " + Math.tan(curx));
 		}
 	}
 }
diff --git a/test/built-ins/Number/prototype/S15.7.3.1_A1_T2.js b/test/built-ins/Number/prototype/S15.7.3.1_A1_T2.js
index 63705263d8af6876d7777a2a0658439bedc922c9..d15410dc1c1433a2cb1dda74d41ae195173554ed 100644
--- a/test/built-ins/Number/prototype/S15.7.3.1_A1_T2.js
+++ b/test/built-ins/Number/prototype/S15.7.3.1_A1_T2.js
@@ -7,7 +7,7 @@ info: >
     attributes
 es5id: 15.7.3.1_A1_T2
 description: Checking if deleting the Number.prototype property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 verifyNotConfigurable(Number, "prototype");
@@ -23,5 +23,5 @@ try {
 }
 
 if (!Number.hasOwnProperty('prototype')) {
-  $FAIL('#2: The Number.prototype property has the attributes DontDelete');
+  $ERROR('#2: The Number.prototype property has the attributes DontDelete');
 }
diff --git a/test/built-ins/Number/prototype/S15.7.3.1_A3.js b/test/built-ins/Number/prototype/S15.7.3.1_A3.js
index d0bcc47dcc9c742e7c01be63f5fbdf0c0b7d8a2c..f871b3dbaf2c62ad411fe69cc57376175d348e87 100644
--- a/test/built-ins/Number/prototype/S15.7.3.1_A3.js
+++ b/test/built-ins/Number/prototype/S15.7.3.1_A3.js
@@ -5,13 +5,12 @@
 info: Number.prototype value is not +0
 es5id: 15.7.3.1_A3
 description: Checking value of Number.prototype property
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   (Number.prototype != 0);
-  $FAIL('#1: "(Number.prototype != 0);" lead to throwing exception. Actual: '+(Number.prototype != 0));
+  $ERROR('#1: "(Number.prototype != 0);" lead to throwing exception. Actual: '+(Number.prototype != 0));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "(Number.prototype != 0)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/S15.7.4_A1.js b/test/built-ins/Number/prototype/S15.7.4_A1.js
index 957be71eeda0ff59262b4b9c814fc29a81874158..e9298a46a330e58ce4ac821350d6c80573cdacf8 100644
--- a/test/built-ins/Number/prototype/S15.7.4_A1.js
+++ b/test/built-ins/Number/prototype/S15.7.4_A1.js
@@ -7,7 +7,6 @@ info: >
     (its [[Class]] is "Number") whose value is +0
 es5id: 15.7.4_A1
 description: Checking type and value of Number.prototype property
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
@@ -18,7 +17,7 @@ if (typeof Number.prototype !== "object") {
 //CHECK#2
 try {
   (Number.prototype != 0);
-  $FAIL('#2: "(Number.prototype != 0);" lead to throwing exception. Actual: '+(Number.prototype != 0));
+  $ERROR('#2: "(Number.prototype != 0);" lead to throwing exception. Actual: '+(Number.prototype != 0));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#2.1: "(Number.prototype != 0)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toFixed/S15.7.4.5_A1.1_T01.js b/test/built-ins/Number/prototype/toFixed/S15.7.4.5_A1.1_T01.js
index d91c64221137789b835c36c69fb4f6c414335b42..52dd8f250cc407539256509456baeb47c08c0c07 100644
--- a/test/built-ins/Number/prototype/toFixed/S15.7.4.5_A1.1_T01.js
+++ b/test/built-ins/Number/prototype/toFixed/S15.7.4.5_A1.1_T01.js
@@ -7,13 +7,12 @@ info: >
     is undefined, this step produces the value 0)
 es5id: 15.7.4.5_A1.1_T01
 description: calling on Number prototype object
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toFixed();
-  $FAIL('#1: "Number.prototype.toFixed();" lead to throwing exception. Actual: '+Number.prototype.toFixed());
+  $ERROR('#1: "Number.prototype.toFixed();" lead to throwing exception. Actual: '+Number.prototype.toFixed());
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toFixed()" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -23,7 +22,7 @@ try {
 //CHECK#2
 try {
   Number.prototype.toFixed(0);
-  $FAIL('#2: "Number.prototype.toFixed(0);" lead to throwing exception. Actual: '+Number.prototype.toFixed(0));
+  $ERROR('#2: "Number.prototype.toFixed(0);" lead to throwing exception. Actual: '+Number.prototype.toFixed(0));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#2.1: "Number.prototype.toFixed(0)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -33,7 +32,7 @@ try {
 //CHECK#3
 try {
   Number.prototype.toFixed(1);
-  $FAIL('#3: "Number.prototype.toFixed(1);" lead to throwing exception. Actual: '+Number.prototype.toFixed(1));
+  $ERROR('#3: "Number.prototype.toFixed(1);" lead to throwing exception. Actual: '+Number.prototype.toFixed(1));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#3.1: "Number.prototype.toFixed(1)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -43,7 +42,7 @@ try {
 //CHECK#4
 try {
   Number.prototype.toFixed(1.1);
-  $FAIL('#4: "Number.prototype.toFixed(1.1);" lead to throwing exception. Actual: '+Number.prototype.toFixed(1.1));
+  $ERROR('#4: "Number.prototype.toFixed(1.1);" lead to throwing exception. Actual: '+Number.prototype.toFixed(1.1));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#4.1: "Number.prototype.toFixed(1.1)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -53,7 +52,7 @@ try {
 //CHECK#5
 try {
   Number.prototype.toFixed(0.9);
-  $FAIL('#5: "Number.prototype.toFixed(0.9);" lead to throwing exception. Actual: '+Number.prototype.toFixed(0.9));
+  $ERROR('#5: "Number.prototype.toFixed(0.9);" lead to throwing exception. Actual: '+Number.prototype.toFixed(0.9));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#5.1: "Number.prototype.toFixed(0.9)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -63,7 +62,7 @@ try {
 //CHECK#6
 try {
   Number.prototype.toFixed("1");
-  $FAIL('#6: "Number.prototype.toFixed("1");" lead to throwing exception. Actual: '+Number.prototype.toFixed("1"));
+  $ERROR('#6: "Number.prototype.toFixed("1");" lead to throwing exception. Actual: '+Number.prototype.toFixed("1"));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#6.1: "Number.prototype.toFixed("1")" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -73,7 +72,7 @@ try {
 //CHECK#7
 try {
   Number.prototype.toFixed("1.1");
-  $FAIL('#7: "Number.prototype.toFixed("1.1");" lead to throwing exception. Actual: '+Number.prototype.toFixed("1.1"));
+  $ERROR('#7: "Number.prototype.toFixed("1.1");" lead to throwing exception. Actual: '+Number.prototype.toFixed("1.1"));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#7.1: "Number.prototype.toFixed("1.1")" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -83,7 +82,7 @@ try {
 //CHECK#8
 try {
   Number.prototype.toFixed("0.9");
-  $FAIL('#8: "Number.prototype.toFixed("0.9");" lead to throwing exception. Actual: '+Number.prototype.toFixed("0.9"));
+  $ERROR('#8: "Number.prototype.toFixed("0.9");" lead to throwing exception. Actual: '+Number.prototype.toFixed("0.9"));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#8.1: "Number.prototype.toFixed("0.9")" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -93,7 +92,7 @@ try {
 //CHECK#9
 try {
   Number.prototype.toFixed(Number.NaN);
-  $FAIL('#9: "Number.prototype.toFixed(Number.NaN);" lead to throwing exception. Actual: '+Number.prototype.toFixed(Number.NaN));
+  $ERROR('#9: "Number.prototype.toFixed(Number.NaN);" lead to throwing exception. Actual: '+Number.prototype.toFixed(Number.NaN));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#9.1: "Number.prototype.toFixed(Number.NaN)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -103,7 +102,7 @@ try {
 //CHECK#10
 try {
   Number.prototype.toFixed("some string");
-  $FAIL('#10: "Number.prototype.toFixed("some string");" lead to throwing exception. Actual: '+Number.prototype.toFixed("some string"));
+  $ERROR('#10: "Number.prototype.toFixed("some string");" lead to throwing exception. Actual: '+Number.prototype.toFixed("some string"));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#10.1: "Number.prototype.toFixed("some string")" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
@@ -113,7 +112,7 @@ try {
 //CHECK#11
 try {
   Number.prototype.toFixed(-0.1);
-  $FAIL('#11: "Number.prototype.toFixed(-0.1);" lead to throwing exception. Actual: '+Number.prototype.toFixed(-0.1));
+  $ERROR('#11: "Number.prototype.toFixed(-0.1);" lead to throwing exception. Actual: '+Number.prototype.toFixed(-0.1));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#11.1: "Number.prototype.toFixed(-0.1)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T01.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T01.js
index 536c5ace335f53f1a6b9ea300778c64816a770b9..3f9fe5efd686a85a8dab034c8bd7ba3e47ed720c 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T01.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T01.js
@@ -8,13 +8,12 @@ info: >
     the resulting string value is returned
 es5id: 15.7.4.2_A1_T01
 description: undefined radix
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString();
-  $FAIL('#1: "Number.prototype.toString();" lead to throwing exception. Actual: '+Number.prototype.toString());
+  $ERROR('#1: "Number.prototype.toString();" lead to throwing exception. Actual: '+Number.prototype.toString());
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString()" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T02.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T02.js
index 8545bca2331196ce5d03b84aac51fac6b48e202d..fbcf79a43a72d1b248f8977f3d79e9da8814e11e 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T02.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T02.js
@@ -8,13 +8,12 @@ info: >
     the resulting string value is returned
 es5id: 15.7.4.2_A1_T02
 description: radix is 10
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(10);
-  $FAIL('#1: "Number.prototype.toString(10);" lead to throwing exception. Actual: '+Number.prototype.toString(10));
+  $ERROR('#1: "Number.prototype.toString(10);" lead to throwing exception. Actual: '+Number.prototype.toString(10));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(10)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T03.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T03.js
index 7b4ae2df0ab8865f60cb2bd9226d5e7ea5da2e5a..a9268767d7a94c590d105e88920c8b60abbd708f 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T03.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A1_T03.js
@@ -8,13 +8,12 @@ info: >
     the resulting string value is returned
 es5id: 15.7.4.2_A1_T03
 description: radix is undefined value
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(undefined);
-  $FAIL('#1: "Number.prototype.toString(undefined);" lead to throwing exception. Actual: '+Number.prototype.toString(undefined));
+  $ERROR('#1: "Number.prototype.toString(undefined);" lead to throwing exception. Actual: '+Number.prototype.toString(undefined));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(undefined)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T01.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T01.js
index c17441d0647a33d0deb5fd267764879b51f328fd..3aa5adc68a05fdc123eadb5efe4fa7c856bf5d1a 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T01.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T01.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T01
 description: radix is 2
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(2);
-  $FAIL('#1: "Number.prototype.toString(2);" lead to throwing exception. Actual: '+Number.prototype.toString(2));
+  $ERROR('#1: "Number.prototype.toString(2);" lead to throwing exception. Actual: '+Number.prototype.toString(2));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(2)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T02.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T02.js
index 54c52b8f384b9cb1e6a5167ac44a81f6b2f2b11a..db8be670e50e05b720c4aef800bf68954231f666 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T02.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T02.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T02
 description: radix is 3
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(3);
-  $FAIL('#1: "Number.prototype.toString(3);" lead to throwing exception. Actual: '+Number.prototype.toString(3));
+  $ERROR('#1: "Number.prototype.toString(3);" lead to throwing exception. Actual: '+Number.prototype.toString(3));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(3)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T03.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T03.js
index 0197cbea3d80edb3f9aa942ce8df93699a804c38..c8c5f4810d2939d8887a7c088ebbe911af2d6b80 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T03.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T03.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T03
 description: radix is 4
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(4);
-  $FAIL('#1: "Number.prototype.toString(4);" lead to throwing exception. Actual: '+Number.prototype.toString(4));
+  $ERROR('#1: "Number.prototype.toString(4);" lead to throwing exception. Actual: '+Number.prototype.toString(4));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(4)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T04.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T04.js
index 55a8ad851bf8dca833576f320e2bfc124b1201d5..ddc77efe4e32b64185c891280cfb938ad7d9e3ae 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T04.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T04.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T04
 description: radix is 5
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(5);
-  $FAIL('#1: "Number.prototype.toString(5);" lead to throwing exception. Actual: '+Number.prototype.toString(5));
+  $ERROR('#1: "Number.prototype.toString(5);" lead to throwing exception. Actual: '+Number.prototype.toString(5));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(5)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T05.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T05.js
index 2e554f7441eea1b8f1a20c21bb061fe57f86066a..78e4da18c16056a55384f7ead3edb274c7e4d9fd 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T05.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T05.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T05
 description: radix is 6
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(6);
-  $FAIL('#1: "Number.prototype.toString(6);" lead to throwing exception. Actual: '+Number.prototype.toString(6));
+  $ERROR('#1: "Number.prototype.toString(6);" lead to throwing exception. Actual: '+Number.prototype.toString(6));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(6)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T06.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T06.js
index 796a9aba846478716e0f2c49de6af668356af666..cea2494f3bb15f54a82293c1618fff7be5e88324 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T06.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T06.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T06
 description: radix is 7
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(7);
-  $FAIL('#1: "Number.prototype.toString(7);" lead to throwing exception. Actual: '+Number.prototype.toString(7));
+  $ERROR('#1: "Number.prototype.toString(7);" lead to throwing exception. Actual: '+Number.prototype.toString(7));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(7)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T07.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T07.js
index abbacb3e30f426b49186cdb65f90003c0c74aeb5..fc95af539968563698f59669ebecea5ede84658f 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T07.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T07.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T07
 description: radix is 8
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(8);
-  $FAIL('#1: "Number.prototype.toString(8);" lead to throwing exception. Actual: '+Number.prototype.toString(8));
+  $ERROR('#1: "Number.prototype.toString(8);" lead to throwing exception. Actual: '+Number.prototype.toString(8));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(8)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T08.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T08.js
index ee631bf88498f367c7d42dda6a7812140163cafb..a9f8b90ba00756522716e9a15baad03a19c9fae6 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T08.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T08.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T08
 description: radix is 9
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(9);
-  $FAIL('#1: "Number.prototype.toString(9);" lead to throwing exception. Actual: '+Number.prototype.toString(9));
+  $ERROR('#1: "Number.prototype.toString(9);" lead to throwing exception. Actual: '+Number.prototype.toString(9));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(9)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T09.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T09.js
index cef78b15bea67bc820eb828ce7f94478f6b0ca4c..485b151af0e36cef12a70483cdd4df239463695f 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T09.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T09.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T09
 description: radix is 11
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(11);
-  $FAIL('#1: "Number.prototype.toString(11);" lead to throwing exception. Actual: '+Number.prototype.toString(11));
+  $ERROR('#1: "Number.prototype.toString(11);" lead to throwing exception. Actual: '+Number.prototype.toString(11));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(11)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T10.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T10.js
index 133cb947681cd21d295a2cd546f51b57fdf284de..fdac0c2ea71aaada09ea0959cc6ed18594517564 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T10.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T10.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T10
 description: radix is 12
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(12);
-  $FAIL('#1: "Number.prototype.toString(12);" lead to throwing exception. Actual: '+Number.prototype.toString(12));
+  $ERROR('#1: "Number.prototype.toString(12);" lead to throwing exception. Actual: '+Number.prototype.toString(12));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(12)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T11.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T11.js
index 9b2deca9f5d13e07ee88d48c167dc7f11e5745f1..9c7386d35d78aef9662dfe25bdaa23357ada242b 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T11.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T11.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T11
 description: radix is 13
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(13);
-  $FAIL('#1: "Number.prototype.toString(13);" lead to throwing exception. Actual: '+Number.prototype.toString(13));
+  $ERROR('#1: "Number.prototype.toString(13);" lead to throwing exception. Actual: '+Number.prototype.toString(13));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(13)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T12.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T12.js
index 464191e078e973a133dca4676e7abe922a8a7614..36aa89a635eea05e0734344f99fd5b513d34bc66 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T12.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T12.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T12
 description: radix is 14
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(14);
-  $FAIL('#1: "Number.prototype.toString(14);" lead to throwing exception. Actual: '+Number.prototype.toString(14));
+  $ERROR('#1: "Number.prototype.toString(14);" lead to throwing exception. Actual: '+Number.prototype.toString(14));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(14)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T13.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T13.js
index dd0cb89a3e277aeb4922e0c9710a8de36c00b00a..72a7972bfcfae2a6fa64ae1395286be2d7c2467e 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T13.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T13.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T13
 description: radix is 15
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(15);
-  $FAIL('#1: "Number.prototype.toString(15);" lead to throwing exception. Actual: '+Number.prototype.toString(15));
+  $ERROR('#1: "Number.prototype.toString(15);" lead to throwing exception. Actual: '+Number.prototype.toString(15));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(15)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T14.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T14.js
index 362a67568d61824fe22870502176b876fedcc396..bb44fb6f1e7789f16d972e94c094368a85fd358d 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T14.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T14.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T14
 description: radix is 16
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(16);
-  $FAIL('#1: "Number.prototype.toString(16);" lead to throwing exception. Actual: '+Number.prototype.toString(16));
+  $ERROR('#1: "Number.prototype.toString(16);" lead to throwing exception. Actual: '+Number.prototype.toString(16));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(16)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T15.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T15.js
index 17573e524248941fe65758df67948714059cf6d8..fae5b8ac0e834139f4b8255b2bc59f24431491db 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T15.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T15.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T15
 description: radix is 17
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(17);
-  $FAIL('#1: "Number.prototype.toString(17);" lead to throwing exception. Actual: '+Number.prototype.toString(17));
+  $ERROR('#1: "Number.prototype.toString(17);" lead to throwing exception. Actual: '+Number.prototype.toString(17));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(17)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T16.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T16.js
index aa523c21ea8eca1a1007000e9c6f431eaf9b53cf..51debe3575854056807fb7792ee80d468aab0985 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T16.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T16.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T16
 description: radix is 18
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(18);
-  $FAIL('#1: "Number.prototype.toString(18);" lead to throwing exception. Actual: '+Number.prototype.toString(18));
+  $ERROR('#1: "Number.prototype.toString(18);" lead to throwing exception. Actual: '+Number.prototype.toString(18));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(18)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T17.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T17.js
index cbee3f1e113743812f494293b5940e6bc95b39d8..d753f5a19050b3191cebdb38ed87b5a6af3f3b91 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T17.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T17.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T17
 description: radix is 19
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(19);
-  $FAIL('#1: "Number.prototype.toString(19);" lead to throwing exception. Actual: '+Number.prototype.toString(19));
+  $ERROR('#1: "Number.prototype.toString(19);" lead to throwing exception. Actual: '+Number.prototype.toString(19));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(19)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T18.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T18.js
index fcf4aafe45ef3ef21d43a596e52240ce8272325f..60986a200b3d2f8acd5f96c49791c7fd0deceea9 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T18.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T18.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T18
 description: radix is 20
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(20);
-  $FAIL('#1: "Number.prototype.toString(20);" lead to throwing exception. Actual: '+Number.prototype.toString(20));
+  $ERROR('#1: "Number.prototype.toString(20);" lead to throwing exception. Actual: '+Number.prototype.toString(20));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(20)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T19.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T19.js
index 55f6a0f25bc9d3c8cd93f4ffe7ed91bfa878b5a3..b9ee0add68eedf0f3313f8de4bb3108a0eca352d 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T19.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T19.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T19
 description: radix is 21
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(21);
-  $FAIL('#1: "Number.prototype.toString(21);" lead to throwing exception. Actual: '+Number.prototype.toString(21));
+  $ERROR('#1: "Number.prototype.toString(21);" lead to throwing exception. Actual: '+Number.prototype.toString(21));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(21)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T20.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T20.js
index 0a9df39c4e4ebf57742a552efdf14d19221e6b97..d2a9f20e9a09a1639d24773bfed63164589f769e 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T20.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T20.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T20
 description: radix is 22
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(22);
-  $FAIL('#1: "Number.prototype.toString(22);" lead to throwing exception. Actual: '+Number.prototype.toString(22));
+  $ERROR('#1: "Number.prototype.toString(22);" lead to throwing exception. Actual: '+Number.prototype.toString(22));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(22)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T21.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T21.js
index 571842649315f29a4d3c75f2449387c883014ac8..073cac80378bd238239d5638c9691fc403a745cc 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T21.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T21.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T21
 description: radix is 23
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(23);
-  $FAIL('#1: "Number.prototype.toString(23);" lead to throwing exception. Actual: '+Number.prototype.toString(23));
+  $ERROR('#1: "Number.prototype.toString(23);" lead to throwing exception. Actual: '+Number.prototype.toString(23));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(23)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T22.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T22.js
index a64a164eb11645755747a5d30aa61bd78e32bcbb..0945621b6a1ba45f6ffcc0df88206b5f02c5e429 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T22.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T22.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T22
 description: radix is 24
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(24);
-  $FAIL('#1: "Number.prototype.toString(24);" lead to throwing exception. Actual: '+Number.prototype.toString(24));
+  $ERROR('#1: "Number.prototype.toString(24);" lead to throwing exception. Actual: '+Number.prototype.toString(24));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(24)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T23.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T23.js
index 407adef04e382525b479e8a4e8623c10a6365acc..c1aeb1dc449fe98a3213da462e4a6d7cb4759c4b 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T23.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T23.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T23
 description: radix is 25
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(25);
-  $FAIL('#1: "Number.prototype.toString(25);" lead to throwing exception. Actual: '+Number.prototype.toString(25));
+  $ERROR('#1: "Number.prototype.toString(25);" lead to throwing exception. Actual: '+Number.prototype.toString(25));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(25)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T24.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T24.js
index fe9b4c86da7c246da47d267615cb31ec683a5809..f207208308364287cb6fc55dc8df97d2448ff9ba 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T24.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T24.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T24
 description: radix is 26
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(26);
-  $FAIL('#1: "Number.prototype.toString(26);" lead to throwing exception. Actual: '+Number.prototype.toString(26));
+  $ERROR('#1: "Number.prototype.toString(26);" lead to throwing exception. Actual: '+Number.prototype.toString(26));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(26)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T25.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T25.js
index 7985d0920be12a11978660f2f04b6c8196a54344..2ae9078dfed88110216834d5eab6b569ac790690 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T25.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T25.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T25
 description: radix is 27
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(27);
-  $FAIL('#1: "Number.prototype.toString(27);" lead to throwing exception. Actual: '+Number.prototype.toString(27));
+  $ERROR('#1: "Number.prototype.toString(27);" lead to throwing exception. Actual: '+Number.prototype.toString(27));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(27)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T26.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T26.js
index 36d9851e1ffa1baa05edc6281ca8a46eb650cca9..098c21efbe62c18036346855c749b2ad301cfd63 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T26.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T26.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T26
 description: radix is 28
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(28);
-  $FAIL('#1: "Number.prototype.toString(28);" lead to throwing exception. Actual: '+Number.prototype.toString(28));
+  $ERROR('#1: "Number.prototype.toString(28);" lead to throwing exception. Actual: '+Number.prototype.toString(28));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(28)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T27.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T27.js
index 793ed9cd30b103937e71b6a31221a17689e2bb00..f2c8c5ea7144f8cec0dba9e2b587d1ede7ccf01f 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T27.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T27.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T27
 description: radix is 29
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(29);
-  $FAIL('#1: "Number.prototype.toString(29);" lead to throwing exception. Actual: '+Number.prototype.toString(29));
+  $ERROR('#1: "Number.prototype.toString(29);" lead to throwing exception. Actual: '+Number.prototype.toString(29));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(29)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T28.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T28.js
index 18f96d6f7823acce8ac529f81b553d717f528b20..9b4ce91877c2554e7b1dbf80451a721aab003686 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T28.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T28.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T28
 description: radix is 30
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(30);
-  $FAIL('#1: "Number.prototype.toString(30);" lead to throwing exception. Actual: '+Number.prototype.toString(30));
+  $ERROR('#1: "Number.prototype.toString(30);" lead to throwing exception. Actual: '+Number.prototype.toString(30));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(30)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T29.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T29.js
index 4814a7c6f401b8127987909cb53744faab656e04..86d0bf0cacef017ddda2da678e160c12df58f0d2 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T29.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T29.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T29
 description: radix is 31
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(31);
-  $FAIL('#1: "Number.prototype.toString(31);" lead to throwing exception. Actual: '+Number.prototype.toString(31));
+  $ERROR('#1: "Number.prototype.toString(31);" lead to throwing exception. Actual: '+Number.prototype.toString(31));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(31)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T30.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T30.js
index d74683210185efb06a15a2461d69bb6f544b8341..c7f4852b868c04c24eb451a2db027f46cbe01b7a 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T30.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T30.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T30
 description: radix is 32
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(32);
-  $FAIL('#1: "Number.prototype.toString(32);" lead to throwing exception. Actual: '+Number.prototype.toString(32));
+  $ERROR('#1: "Number.prototype.toString(32);" lead to throwing exception. Actual: '+Number.prototype.toString(32));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(32)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T31.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T31.js
index 29c856202a707f6c091a5a937d216f6ed3eabd4b..fd4bdd2075203914cd195785805fb89d5cc5270c 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T31.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T31.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T31
 description: radix is 33
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(33);
-  $FAIL('#1: "Number.prototype.toString(33);" lead to throwing exception. Actual: '+Number.prototype.toString(33));
+  $ERROR('#1: "Number.prototype.toString(33);" lead to throwing exception. Actual: '+Number.prototype.toString(33));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(33)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T32.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T32.js
index 8067fc2618e783e1e8a8ff8506726decf48098d1..104ee3bb15d9a5ed6d3dcaa7c512187d8dd1a894 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T32.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T32.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T32
 description: radix is 34
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(34);
-  $FAIL('#1: "Number.prototype.toString(34);" lead to throwing exception. Actual: '+Number.prototype.toString(34));
+  $ERROR('#1: "Number.prototype.toString(34);" lead to throwing exception. Actual: '+Number.prototype.toString(34));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(34)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T33.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T33.js
index fc3c34ef82c622a9923b86c45bada169bb996a58..397f730a46194219fb63299e96dc183048078374 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T33.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T33.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T33
 description: radix is 35
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(35);
-  $FAIL('#1: "Number.prototype.toString(35);" lead to throwing exception. Actual: '+Number.prototype.toString(35));
+  $ERROR('#1: "Number.prototype.toString(35);" lead to throwing exception. Actual: '+Number.prototype.toString(35));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(35)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T34.js b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T34.js
index 091e4903747a660a5e9f642ba8c5e6d0bbc2f8dd..11bcfca07214bb39d16e8b17bce22013c69ea686 100644
--- a/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T34.js
+++ b/test/built-ins/Number/prototype/toString/S15.7.4.2_A2_T34.js
@@ -7,13 +7,12 @@ info: >
     the result is a string, the choice of which is implementation-dependent
 es5id: 15.7.4.2_A2_T34
 description: radix is 36
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.toString(36);
-  $FAIL('#1: "Number.prototype.toString(36);" lead to throwing exception. Actual: '+Number.prototype.toString(36));
+  $ERROR('#1: "Number.prototype.toString(36);" lead to throwing exception. Actual: '+Number.prototype.toString(36));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.toString(36)" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/valueOf/S15.7.4.4_A1_T01.js b/test/built-ins/Number/prototype/valueOf/S15.7.4.4_A1_T01.js
index 2c218e3683e7cf881db95f5d3d6a0c664a5e9b36..fdaa9ca7ba618f8da15be63dfd05eeb9bbf04d01 100644
--- a/test/built-ins/Number/prototype/valueOf/S15.7.4.4_A1_T01.js
+++ b/test/built-ins/Number/prototype/valueOf/S15.7.4.4_A1_T01.js
@@ -5,13 +5,12 @@
 info: Number.prototype.valueOf() returns this number value
 es5id: 15.7.4.4_A1_T01
 description: Call without argument
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.valueOf();
-  $FAIL('#1: "Number.prototype.valueOf();" lead to throwing exception. Actual: '+Number.prototype.valueOf());
+  $ERROR('#1: "Number.prototype.valueOf();" lead to throwing exception. Actual: '+Number.prototype.valueOf());
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.valueOf()" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Number/prototype/valueOf/S15.7.4.4_A1_T02.js b/test/built-ins/Number/prototype/valueOf/S15.7.4.4_A1_T02.js
index b1e6cbf1e60b3c3640d97cdcf2c0341b956720cb..6205a04ceea2e1fbed899e904028c64e848a5f57 100644
--- a/test/built-ins/Number/prototype/valueOf/S15.7.4.4_A1_T02.js
+++ b/test/built-ins/Number/prototype/valueOf/S15.7.4.4_A1_T02.js
@@ -5,13 +5,12 @@
 info: Number.prototype.valueOf() returns this number value
 es5id: 15.7.4.4_A1_T02
 description: calling with argument
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 try {
   Number.prototype.valueOf("argument");
-  $FAIL('#1: "Number.prototype.valueOf("argument");" lead to throwing exception. Actual: '+Number.prototype.valueOf("argument"));
+  $ERROR('#1: "Number.prototype.valueOf("argument");" lead to throwing exception. Actual: '+Number.prototype.valueOf("argument"));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "Number.prototype.valueOf("argument")" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/Object/S15.2.1.1_A2_T1.js b/test/built-ins/Object/S15.2.1.1_A2_T1.js
index 264667eb69a8f1b84e9fcc7afea12c0bc3762580..c661966c373a18ee285fb781ffddb41a6623371f 100644
--- a/test/built-ins/Object/S15.2.1.1_A2_T1.js
+++ b/test/built-ins/Object/S15.2.1.1_A2_T1.js
@@ -7,13 +7,12 @@ info: >
     and the value neither is null nor undefined, and is supplied, return ToObject(value)
 es5id: 15.2.1.1_A2_T1
 description: Calling Object function with boolean argument value
-includes: [$FAIL.js]
 ---*/
 
 var bool = true;
 
 if(typeof bool !== 'boolean'){
-  $FAIL('#1: bool should be boolean primitive');
+  $ERROR('#1: bool should be boolean primitive');
 }
 
 var obj = Object(bool);
diff --git a/test/built-ins/Object/S15.2.1.1_A2_T4.js b/test/built-ins/Object/S15.2.1.1_A2_T4.js
index b47a34ad99eb5e9328159a26066df00962955122..53500a4787a4175f4118cfa18e93d02707991b81 100644
--- a/test/built-ins/Object/S15.2.1.1_A2_T4.js
+++ b/test/built-ins/Object/S15.2.1.1_A2_T4.js
@@ -7,14 +7,13 @@ info: >
     and the value neither is null nor undefined, and is supplied, return ToObject(value)
 es5id: 15.2.1.1_A2_T4
 description: Calling Object function with object argument value
-includes: [$FAIL.js]
 ---*/
 
 var obj = {flag:true};
 
 //CHECK#1
 if (typeof(obj) !== 'object') {
-  $FAIL('#1: obj = {flag:true} should be an Object');
+  $ERROR('#1: obj = {flag:true} should be an Object');
 }
 
 var n_obj = Object(obj);
diff --git a/test/built-ins/Object/S15.2.1.1_A2_T7.js b/test/built-ins/Object/S15.2.1.1_A2_T7.js
index 5f292ee21207c4b2c845db0441643a79b1ec6ded..f6ed3c097e7085d1fb2b9577e887d132e97e1f8d 100644
--- a/test/built-ins/Object/S15.2.1.1_A2_T7.js
+++ b/test/built-ins/Object/S15.2.1.1_A2_T7.js
@@ -7,14 +7,13 @@ info: >
     and the value neither is null nor undefined, and is supplied, return ToObject(value)
 es5id: 15.2.1.1_A2_T7
 description: Calling Object function with empty string argument value
-includes: [$FAIL.js]
 ---*/
 
 var str = '';
 
 // CHECK#1
 if (typeof(str) !== 'string') {
-  $FAIL('#1: "" is NOT a String');
+  $ERROR('#1: "" is NOT a String');
 }
 
 var obj = Object(str);
diff --git a/test/built-ins/Object/S15.2.2.1_A3_T1.js b/test/built-ins/Object/S15.2.2.1_A3_T1.js
index 539b6a23b4f1452fa93c707462fa5b66cdfed520..d4e477d536f411205f4f2b9587857b56a01eab0e 100644
--- a/test/built-ins/Object/S15.2.2.1_A3_T1.js
+++ b/test/built-ins/Object/S15.2.2.1_A3_T1.js
@@ -7,14 +7,13 @@ info: >
     the type of value is String, return ToObject(string)
 es5id: 15.2.2.1_A3_T1
 description: Argument value is a nonempty string
-includes: [$FAIL.js]
 ---*/
 
 var str = 'Obi-Wan Kenobi';
 
 //CHECK#1
 if (typeof str  !== 'string') {
-  $FAIL('#1: "Obi-Wan Kenobi" is NOT a String');
+  $ERROR('#1: "Obi-Wan Kenobi" is NOT a String');
 }
 
 
diff --git a/test/built-ins/Object/S15.2.2.1_A3_T2.js b/test/built-ins/Object/S15.2.2.1_A3_T2.js
index 4bc8a9f6bb31ea8a2ca8633b9c11caf903852573..3252bb6f0b64f3ec3271ac40dfe823a32846dab7 100644
--- a/test/built-ins/Object/S15.2.2.1_A3_T2.js
+++ b/test/built-ins/Object/S15.2.2.1_A3_T2.js
@@ -7,14 +7,13 @@ info: >
     the type of value is String, return ToObject(string)
 es5id: 15.2.2.1_A3_T2
 description: Argument value is an empty string
-includes: [$FAIL.js]
 ---*/
 
 var str = '';
 
 //CHECK#1
 if (typeof str  !== 'string') {
-  $FAIL('#1: "" is NOT a String');
+  $ERROR('#1: "" is NOT a String');
 }
 
 var n_obj = new Object(str);
diff --git a/test/built-ins/Object/S15.2.2.1_A4_T1.js b/test/built-ins/Object/S15.2.2.1_A4_T1.js
index e48a9632c59de13bcd76b7de170456f5aae9224c..31ea1289b8604bd0f1c01c41f74d9280987c32a0 100644
--- a/test/built-ins/Object/S15.2.2.1_A4_T1.js
+++ b/test/built-ins/Object/S15.2.2.1_A4_T1.js
@@ -7,14 +7,13 @@ info: >
     the type of value is Boolean, return ToObject(boolean)
 es5id: 15.2.2.1_A4_T1
 description: Argument value is "true"
-includes: [$FAIL.js]
 ---*/
 
 var bool = true;
 
 //CHECK#1
 if (typeof bool  !== 'boolean') {
-  $FAIL('#1: true is NOT a boolean');
+  $ERROR('#1: true is NOT a boolean');
 }
 
 var n_obj = new Object(bool);
diff --git a/test/built-ins/Object/S15.2.2.1_A4_T2.js b/test/built-ins/Object/S15.2.2.1_A4_T2.js
index 28099bf2715798a5d7f66487d8a6e9e7626b8d90..ec3e1f3e6ee6f5ca81fae0c474f2efbaf4a0dedd 100644
--- a/test/built-ins/Object/S15.2.2.1_A4_T2.js
+++ b/test/built-ins/Object/S15.2.2.1_A4_T2.js
@@ -7,14 +7,13 @@ info: >
     the type of value is Boolean, return ToObject(boolean)
 es5id: 15.2.2.1_A4_T2
 description: Argument value is "false"
-includes: [$FAIL.js]
 ---*/
 
 var bool = false;
 
 //CHECK#1
 if (typeof bool  !== 'boolean') {
-  $FAIL('#1: false is NOT a boolean');
+  $ERROR('#1: false is NOT a boolean');
 }
 
 var n_obj = new Object(bool);
diff --git a/test/built-ins/Object/S15.2.2.1_A5_T1.js b/test/built-ins/Object/S15.2.2.1_A5_T1.js
index a74bb7ef1fa4fd414537b26b4d83367548cd7bf1..69f28bab93fdd6a14323edcfb2f59e22a835afe5 100644
--- a/test/built-ins/Object/S15.2.2.1_A5_T1.js
+++ b/test/built-ins/Object/S15.2.2.1_A5_T1.js
@@ -7,14 +7,13 @@ info: >
     the type of value is Number, return ToObject(number)
 es5id: 15.2.2.1_A5_T1
 description: Argument value is any number
-includes: [$FAIL.js]
 ---*/
 
 var num = 1.0;
 
 //CHECK#1
 if (typeof num  !== 'number') {
-  $FAIL('#1: 1.0 is NOT a number');
+  $ERROR('#1: 1.0 is NOT a number');
 }
 
 var n_obj = new Object(num);
diff --git a/test/built-ins/Object/S15.2.2.1_A5_T2.js b/test/built-ins/Object/S15.2.2.1_A5_T2.js
index 4e29079df4bb71647aa8daf2df70c8ff88267f4a..03928351b3872aab9e3e4c16e034ce508d7226d3 100644
--- a/test/built-ins/Object/S15.2.2.1_A5_T2.js
+++ b/test/built-ins/Object/S15.2.2.1_A5_T2.js
@@ -7,14 +7,13 @@ info: >
     the type of value is Number, return ToObject(number)
 es5id: 15.2.2.1_A5_T2
 description: Argument value is NaN
-includes: [$FAIL.js]
 ---*/
 
 var num = NaN;
 
 //CHECK#1
 if (typeof num  !== 'number') {
-  $FAIL('#1: NaN is NOT a number');
+  $ERROR('#1: NaN is NOT a number');
 }
 
 var n_obj = new Object(num);
diff --git a/test/built-ins/Object/S15.2.2.1_A5_T3.js b/test/built-ins/Object/S15.2.2.1_A5_T3.js
index 13b996c583c901a3df655e2e9b42313a600a7319..970db24095b81eef0fb98257740ee3690918dd96 100644
--- a/test/built-ins/Object/S15.2.2.1_A5_T3.js
+++ b/test/built-ins/Object/S15.2.2.1_A5_T3.js
@@ -7,14 +7,13 @@ info: >
     the type of value is Number, return ToObject(number)
 es5id: 15.2.2.1_A5_T3
 description: Argument value is Infinity
-includes: [$FAIL.js]
 ---*/
 
 var num = Infinity;
 
 //CHECK#1
 if (typeof num  !== 'number') {
-  $FAIL('#1: Infinity is NOT a number');
+  $ERROR('#1: Infinity is NOT a number');
 }
 
 var n_obj = new Object(num);
diff --git a/test/built-ins/Object/prototype/S15.2.4_A3.js b/test/built-ins/Object/prototype/S15.2.4_A3.js
index d289b2af21035e1a0ae20bbfff1dd281ec49a3bf..4f8f3bad8fbd9f9fea09854f39c71593a7e17352 100644
--- a/test/built-ins/Object/prototype/S15.2.4_A3.js
+++ b/test/built-ins/Object/prototype/S15.2.4_A3.js
@@ -9,13 +9,12 @@ es5id: 15.2.4_A3
 description: Checking if calling Object prototype as a function fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 //CHECK#1
 try {
   Object.prototype();
-  $FAIL('#1: Since Object prototype object is not function it has not [[call]] method');
+  $ERROR('#1: Since Object prototype object is not function it has not [[call]] method');
 } catch (e) {
   $PRINT(e);
 }
diff --git a/test/built-ins/Object/prototype/S15.2.4_A4.js b/test/built-ins/Object/prototype/S15.2.4_A4.js
index 1e93ebba9f63ecb42d591923ccc4614fd263b68b..8cff6c8f43daa09fb910cf9bca42c73d4e0e40b6 100644
--- a/test/built-ins/Object/prototype/S15.2.4_A4.js
+++ b/test/built-ins/Object/prototype/S15.2.4_A4.js
@@ -9,13 +9,12 @@ es5id: 15.2.4_A4
 description: Checking if creating "new Object.prototype" fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 //CHECK#1
 try {
   var instance = new Object.prototype;
-  $FAIL('#1: Since Object prototype object is not function it has not [[create]] method');
+  $ERROR('#1: Since Object prototype object is not function it has not [[create]] method');
 } catch (e) {
   $PRINT(e);
 }
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A10.js b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A10.js
index 5a190b8cb58eef3ebc952731b5cd447eeb9b7f04..b4efdbd1e09f10b1ec625988b88b8d911912c896 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A10.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A10.js
@@ -9,12 +9,12 @@ es5id: 15.2.4.5_A10
 description: >
     Checking if varying the Object.prototype.hasOwnProperty.length
     property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (!(Object.prototype.hasOwnProperty.hasOwnProperty('length'))) {
-  $FAIL('#1: the Object.prototype.hasOwnProperty has length property.');
+  $ERROR('#1: the Object.prototype.hasOwnProperty has length property.');
 }
 
 var obj = Object.prototype.hasOwnProperty.length;
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A7.js b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A7.js
index df3210c9adaeb0bf57a5fcb72d6ead57c6277f80..228b00b07c148eb64e822c3214ae7b6a1256714f 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A7.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A7.js
@@ -7,14 +7,13 @@ es5id: 15.2.4.5_A7
 description: Checking if creating "new Object.prototype.hasOwnProperty" fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var FACTORY = Object.prototype.hasOwnProperty;
 
 try {
   var instance = new FACTORY;
-  $FAIL('#1: Object.prototype.hasOwnProperty can\'t be used as a constructor');
+  $ERROR('#1: Object.prototype.hasOwnProperty can\'t be used as a constructor');
 } catch (e) {
   $PRINT(e);
 
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A8.js b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A8.js
index d412a66666c7b825835bd41190386e1f033468de..35bb81983ca2f161283d183fa8d331584d0f2bdb 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A8.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A8.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.5_A8
 description: >
     Checking if enumerating the Object.prototype.hasOwnProperty.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.hasOwnProperty.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.hasOwnProperty has length property.');
+  $ERROR('#0: the Object.prototype.hasOwnProperty has length property.');
 }
 
 
diff --git a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A9.js b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A9.js
index 661ca20afe9185e6c94b011a0203f53130b93a3c..8c59071c562cb23171241abd96ed9fad82fa6479 100644
--- a/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A9.js
+++ b/test/built-ins/Object/prototype/hasOwnProperty/S15.2.4.5_A9.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.5_A9
 description: >
     Checking if deleting the Object.prototype.hasOwnProperty.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.hasOwnProperty.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.hasOwnProperty has length property');
+  $ERROR('#0: the Object.prototype.hasOwnProperty has length property');
 }
 
 //CHECK#1
@@ -24,5 +23,5 @@ if (!delete Object.prototype.hasOwnProperty.length) {
 
 //CHECK#2
 if (Object.prototype.hasOwnProperty.hasOwnProperty('length')) {
-  $FAIL('#2: The Object.prototype.hasOwnProperty.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Object.prototype.hasOwnProperty.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A10.js b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A10.js
index 466a70a6974024ed25eba7c6fd75eecb6d6045b2..d4562890d2f73b5838ccc1d84275705d0e9058e2 100644
--- a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A10.js
+++ b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A10.js
@@ -9,12 +9,12 @@ es5id: 15.2.4.6_A10
 description: >
     Checking if varying the Object.prototype.isPrototypeOf.length
     property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (!(Object.prototype.isPrototypeOf.hasOwnProperty('length'))) {
-  $FAIL('#1: the Object.prototype.isPrototypeOf has length property');
+  $ERROR('#1: the Object.prototype.isPrototypeOf has length property');
 }
 
 var obj = Object.prototype.isPrototypeOf.length;
diff --git a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A7.js b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A7.js
index 3dea47d2bf141a6995b1b71e0b073ce99f973230..410f91bb6478847360749180720bcef8d3a3936c 100644
--- a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A7.js
+++ b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A7.js
@@ -7,14 +7,13 @@ es5id: 15.2.4.6_A7
 description: Checking if creating new "Object.prototype.isPrototypeOf" fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var FACTORY = Object.prototype.isPrototypeOf;
 
 try {
   var instance = new FACTORY;
-  $FAIL('#1: Object.prototype.isPrototypeOf can\'t be used as a constructor');
+  $ERROR('#1: Object.prototype.isPrototypeOf can\'t be used as a constructor');
 } catch (e) {
   $PRINT(e);
 
diff --git a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A8.js b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A8.js
index 508fe89294137de235e8ba7a7f2eac1978caf7c7..ceb13dfd7b370925fb4720a48a9c3cb54351c415 100644
--- a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A8.js
+++ b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A8.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.6_A8
 description: >
     Checknig if enumerating the Object.prototype.isPrototypeOf.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.isPrototypeOf.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.isPrototypeOf has length property');
+  $ERROR('#0: the Object.prototype.isPrototypeOf has length property');
 }
 
 
diff --git a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A9.js b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A9.js
index 463510bcb9b44b6a678fa5ef529984828d720814..ac77c3a693cbf9ca14b9bfc3ae046666c04af8c6 100644
--- a/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A9.js
+++ b/test/built-ins/Object/prototype/isPrototypeOf/S15.2.4.6_A9.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.6_A9
 description: >
     Checking deleting the Object.prototype.isPrototypeOf.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.isPrototypeOf.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.isPrototypeOf has length property');
+  $ERROR('#0: the Object.prototype.isPrototypeOf has length property');
 }
 
 //CHECK#1
diff --git a/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A10.js b/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A10.js
index 4aa9a16b65a5191b200304d4aca528a4b2124853..d7db0292b13e04c6c2efdbad5225e398dec762cb 100644
--- a/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A10.js
+++ b/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A10.js
@@ -9,12 +9,12 @@ es5id: 15.2.4.7_A10
 description: >
     Checking if varying the
     Object.prototype.propertyIsEnumerable.length property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (!(Object.prototype.propertyIsEnumerable.hasOwnProperty('length'))) {
-  $FAIL('#1: the Object.prototype.propertyIsEnumerable has length property');
+  $ERROR('#1: the Object.prototype.propertyIsEnumerable has length property');
 }
 
 var obj = Object.prototype.propertyIsEnumerable.length;
diff --git a/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A7.js b/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A7.js
index 600e6d2c7ed03ab04a7a13fa5776e85cd6eb6445..34821898f3a2a9c9408ff1d0b6b620cf6be167f0 100644
--- a/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A7.js
+++ b/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A7.js
@@ -9,14 +9,13 @@ description: >
     fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var FACTORY = Object.prototype.propertyIsEnumerable;
 
 try {
   var instance = new FACTORY;
-  $FAIL('#1: Object.prototype.propertyIsEnumerable can\'t be used as a constructor');
+  $ERROR('#1: Object.prototype.propertyIsEnumerable can\'t be used as a constructor');
 } catch (e) {
   $PRINT(e);
 
diff --git a/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A8.js b/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A8.js
index f6c6b3a7346a4428b998b29ca873bb9589787393..0e3fb96ef7982fb4b18a1dedf5d66e1b15be1bca 100644
--- a/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A8.js
+++ b/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A8.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.7_A8
 description: >
     Checking if enumerating the
     Object.prototype.propertyIsEnumerable.length property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.propertyIsEnumerable.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.propertyIsEnumerable has length property');
+  $ERROR('#0: the Object.prototype.propertyIsEnumerable has length property');
 }
 
 
diff --git a/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A9.js b/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A9.js
index 3ac3248d1d7fef5e2195a693c36e92ec660e0366..888cdb888a505bd1d691b520b0f5ce04d93e6275 100644
--- a/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A9.js
+++ b/test/built-ins/Object/prototype/propertyIsEnumerable/S15.2.4.7_A9.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.7_A9
 description: >
     Checking if deleting the
     Object.prototype.propertyIsEnumerable.length property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.propertyIsEnumerable.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.propertyIsEnumerable has length property');
+  $ERROR('#0: the Object.prototype.propertyIsEnumerable has length property');
 }
 
 //CHECK#1
diff --git a/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A10.js b/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A10.js
index f77571101ea8ed2577870d4b2a28497ba8fb58c5..0c31c381a7b7d9ffc0a090ae806dbf34f54b52df 100644
--- a/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A10.js
+++ b/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A10.js
@@ -9,12 +9,12 @@ es5id: 15.2.4.3_A10
 description: >
     Checking if varying the Object.prototype.toLocaleString.length
     property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (!(Object.prototype.toLocaleString.hasOwnProperty('length'))) {
-  $FAIL('#1: the Object.prototype.toLocaleString has length property.');
+  $ERROR('#1: the Object.prototype.toLocaleString has length property.');
 }
 
 var obj = Object.prototype.toLocaleString.length;
diff --git a/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A7.js b/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A7.js
index 1f1600e98077de655a349b54e4a783647dfa26a2..5567a3fb802016ae5f8dd33e28a5e90ab5c2b763 100644
--- a/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A7.js
+++ b/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A7.js
@@ -7,14 +7,13 @@ es5id: 15.2.4.3_A7
 description: Checking if creating "new Object.prototype.toLocaleString" fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var FACTORY = Object.prototype.toLocaleString;
 
 try {
   var instance = new FACTORY;
-  $FAIL('#1: Object.prototype.toLocaleString can\'t be used as a constructor');
+  $ERROR('#1: Object.prototype.toLocaleString can\'t be used as a constructor');
 } catch (e) {
   $PRINT(e);
 
diff --git a/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A8.js b/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A8.js
index b051815fa04e1733d6fd7e28d4fda1c38fd06610..cafc7fe23d5021831fe5f95a71f71c121fe0cc89 100644
--- a/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A8.js
+++ b/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A8.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.3_A8
 description: >
     Checking if enumerating the Object.prototype.toLocaleString.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.toLocaleString.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.toLocaleString has length property.');
+  $ERROR('#0: the Object.prototype.toLocaleString has length property.');
 }
 
 
diff --git a/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A9.js b/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A9.js
index b01ed66357bead6b06aadbf9dd97e11bb867bfe2..19865a67fa6f07454b00eacaddb657513b762990 100644
--- a/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A9.js
+++ b/test/built-ins/Object/prototype/toLocaleString/S15.2.4.3_A9.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.3_A9
 description: >
     Checknig if deleting of the Object.prototype.toLocaleString.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.toLocaleString.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.toLocaleString has length property');
+  $ERROR('#0: the Object.prototype.toLocaleString has length property');
 }
 
 //CHECK#1
@@ -24,5 +23,5 @@ if (!delete Object.prototype.toLocaleString.length) {
 
 //CHECK#2
 if (Object.prototype.toLocaleString.hasOwnProperty('length')) {
-  $FAIL('#2: The Object.prototype.toLocaleString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Object.prototype.toLocaleString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Object/prototype/toString/S15.2.4.2_A10.js b/test/built-ins/Object/prototype/toString/S15.2.4.2_A10.js
index 887915b20e2de4355ff54401ccac906012c0cebe..9478a50d76cb47a0dde94ffbe24ab83812b82c8c 100644
--- a/test/built-ins/Object/prototype/toString/S15.2.4.2_A10.js
+++ b/test/built-ins/Object/prototype/toString/S15.2.4.2_A10.js
@@ -7,12 +7,12 @@ es5id: 15.2.4.2_A10
 description: >
     Checking if varying the Object.prototype.toString.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (!(Object.prototype.toString.hasOwnProperty('length'))) {
-  $FAIL('#1: the Object.prototype.toString has length property.');
+  $ERROR('#1: the Object.prototype.toString has length property.');
 }
 
 var obj = Object.prototype.toString.length;
diff --git a/test/built-ins/Object/prototype/toString/S15.2.4.2_A7.js b/test/built-ins/Object/prototype/toString/S15.2.4.2_A7.js
index 6506fb28753e42860f136a4fe258a3281c1a1df1..ea58f028ecccbe8d0218cfaeec5783b2980b4afc 100644
--- a/test/built-ins/Object/prototype/toString/S15.2.4.2_A7.js
+++ b/test/built-ins/Object/prototype/toString/S15.2.4.2_A7.js
@@ -7,14 +7,13 @@ es5id: 15.2.4.2_A7
 description: Checking if creating "new Object.prototype.toString" fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var FACTORY = Object.prototype.toString;
 
 try {
   var instance = new FACTORY;
-  $FAIL('#1: Object.prototype.toString can\'t be used as a constructor');
+  $ERROR('#1: Object.prototype.toString can\'t be used as a constructor');
 } catch (e) {
   $PRINT(e);
 }
diff --git a/test/built-ins/Object/prototype/toString/S15.2.4.2_A8.js b/test/built-ins/Object/prototype/toString/S15.2.4.2_A8.js
index bc97bd69890973146a891d98517f4bb604d72156..5432ecd3b70ded8c73750d8385623b26d4eb8f71 100644
--- a/test/built-ins/Object/prototype/toString/S15.2.4.2_A8.js
+++ b/test/built-ins/Object/prototype/toString/S15.2.4.2_A8.js
@@ -7,12 +7,11 @@ es5id: 15.2.4.2_A8
 description: >
     Checking if enumerating the Object.prototype.toString.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.toString.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.toString has length property.');
+  $ERROR('#0: the Object.prototype.toString has length property.');
 }
 
 
diff --git a/test/built-ins/Object/prototype/toString/S15.2.4.2_A9.js b/test/built-ins/Object/prototype/toString/S15.2.4.2_A9.js
index 200d8cd1713355a8576b81730fed86ffe0f4c220..813ff27b597eb49c99738a511742eab25017da44 100644
--- a/test/built-ins/Object/prototype/toString/S15.2.4.2_A9.js
+++ b/test/built-ins/Object/prototype/toString/S15.2.4.2_A9.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.2_A9
 description: >
     Checknig if deleting of the Object.prototype.toString.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.toString.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.toString has length property');
+  $ERROR('#0: the Object.prototype.toString has length property');
 }
 
 //CHECK#1
@@ -24,5 +23,5 @@ if (!delete Object.prototype.toString.length) {
 
 //CHECK#2
 if (Object.prototype.toString.hasOwnProperty('length')) {
-  $FAIL('#2: The Object.prototype.toString.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Object.prototype.toString.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A10.js b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A10.js
index 734343a08cf8fe4dfefd91beb285554c4dbec358..83df8a3bdd69f36f8db9edb5a0cb1551c4c59f43 100644
--- a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A10.js
+++ b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A10.js
@@ -7,12 +7,12 @@ es5id: 15.2.4.4_A10
 description: >
     Checking if varying the Object.prototype.valueOf.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (!(Object.prototype.valueOf.hasOwnProperty('length'))) {
-  $FAIL('#1: the Object.prototype.valueOf has length property.');
+  $ERROR('#1: the Object.prototype.valueOf has length property.');
 }
 
 var obj = Object.prototype.valueOf.length;
diff --git a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A7.js b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A7.js
index 339d5e1f05d478415f8a250214a43e774f9219cc..902fa142a8f5550a01caeb9e5f0b5b661ef3f501 100644
--- a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A7.js
+++ b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A7.js
@@ -7,14 +7,13 @@ es5id: 15.2.4.4_A7
 description: Checking if creating "new Object.prototype.valueOf" fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var FACTORY = Object.prototype.valueOf;
 
 try {
   var instance = new FACTORY;
-  $FAIL('#1: Object.prototype.valueOf can\'t be used as a constructor');
+  $ERROR('#1: Object.prototype.valueOf can\'t be used as a constructor');
 } catch (e) {
   $PRINT(e);
 
diff --git a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A8.js b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A8.js
index c37406fa0c5d70e7e4237898b71954d61923f815..384ef8319766a2302bea07e72b318e6f567219f5 100644
--- a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A8.js
+++ b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A8.js
@@ -7,12 +7,11 @@ es5id: 15.2.4.4_A8
 description: >
     Checking if enumerating the Object.prototype.valueOf.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.valueOf.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.valueOf has length property.');
+  $ERROR('#0: the Object.prototype.valueOf has length property.');
 }
 
 
diff --git a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A9.js b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A9.js
index d04f6a374be58525b41a4873c5d850eae45f9ebf..482d368e1a0117d2b46324279da83603098b7926 100644
--- a/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A9.js
+++ b/test/built-ins/Object/prototype/valueOf/S15.2.4.4_A9.js
@@ -9,12 +9,11 @@ es5id: 15.2.4.4_A9
 description: >
     Checknig if deleting of the Object.prototype.valueOf.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if (!(Object.prototype.valueOf.hasOwnProperty('length'))) {
-  $FAIL('#0: the Object.prototype.valueOf has length property');
+  $ERROR('#0: the Object.prototype.valueOf has length property');
 }
 
 //CHECK#1
@@ -24,5 +23,5 @@ if (!delete Object.prototype.valueOf.length) {
 
 //CHECK#2
 if (Object.prototype.valueOf.hasOwnProperty('length')) {
-  $FAIL('#2: The Object.prototype.valueOf.length property does not have the attributes DontDelete');
+  $ERROR('#2: The Object.prototype.valueOf.length property does not have the attributes DontDelete');
 }
diff --git a/test/built-ins/RegExp/prototype/S15.10.5.1_A3.js b/test/built-ins/RegExp/prototype/S15.10.5.1_A3.js
index 55b48d98bb5c33230aaee823f89b1bee5ed11266..1ad8fa95eaa558ba28153f702cb72c891b4c409f 100644
--- a/test/built-ins/RegExp/prototype/S15.10.5.1_A3.js
+++ b/test/built-ins/RegExp/prototype/S15.10.5.1_A3.js
@@ -5,12 +5,12 @@
 info: The RegExp.prototype property has the attribute DontDelete
 es5id: 15.10.5.1_A3
 description: Checking if deleting the RegExp.prototype property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#0
 if (RegExp.hasOwnProperty('prototype') !== true) {
-	$FAIL('#0: RegExp.hasOwnProperty(\'prototype\') === true');
+	$ERROR('#0: RegExp.hasOwnProperty(\'prototype\') === true');
 }
 
 verifyNotConfigurable(RegExp, "prototype");
diff --git a/test/built-ins/RegExp/prototype/S15.10.5.1_A4.js b/test/built-ins/RegExp/prototype/S15.10.5.1_A4.js
index db97e911b05ee36a94c857a4673e7abe086adf44..48bf65f19d2fd1c3eb7a82eb7511f5bbbffe0f86 100644
--- a/test/built-ins/RegExp/prototype/S15.10.5.1_A4.js
+++ b/test/built-ins/RegExp/prototype/S15.10.5.1_A4.js
@@ -5,12 +5,12 @@
 info: The RegExp.prototype property has the attribute ReadOnly
 es5id: 15.10.5.1_A4
 description: Checking if varying the RegExp.prototype property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (RegExp.hasOwnProperty('prototype') !== true) {
-	$FAIL('#1: RegExp.hasOwnProperty(\'prototype\') === true');
+	$ERROR('#1: RegExp.hasOwnProperty(\'prototype\') === true');
 }
 
 var __obj = RegExp.prototype;
diff --git a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A10.js b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A10.js
index d3ecd4035d2ea154adc08a061f3c73e90e44b4e5..5c69cca8ef20e86231b466291be3376eb1537c1f 100644
--- a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A10.js
+++ b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A10.js
@@ -5,12 +5,12 @@
 info: The RegExp.prototype.exec.length property has the attribute ReadOnly
 es5id: 15.10.6.2_A10
 description: Checking if varying the RegExp.prototype.exec.length property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (RegExp.prototype.exec.hasOwnProperty('length') !== true) {
-  $FAIL('#1: RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
+  $ERROR('#1: RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
 }
 
 var __obj = RegExp.prototype.exec.length;
diff --git a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A11.js b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A11.js
index b3052f3d1819c7980fede1fce4fb3df4a6a40af9..5b9af15e333b0a4d950478fd8b1617f9d15b34a1 100644
--- a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A11.js
+++ b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A11.js
@@ -5,12 +5,11 @@
 info: The length property of the exec method is 1
 es5id: 15.10.6.2_A11
 description: Checking RegExp.prototype.exec.length
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (RegExp.prototype.exec.hasOwnProperty("length") !== true) {
-  $FAIL('#1: RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
+  $ERROR('#1: RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
 }
 
 //CHECK#2
diff --git a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A12.js b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A12.js
index 38276478fb877008338a15f8a6cb0f7e312a530a..1fd0f84ac87cbf07166e3e177e2eb893d4dbca43 100644
--- a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A12.js
+++ b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A12.js
@@ -5,14 +5,13 @@
 info: regExp exec() acts like regExp.exec('undefined') (step 2)
 es5id: 15.10.6.2_A12
 description: Checking RegExp.prototype.exec
-includes: [$FAIL.js]
 ---*/
 
 (/foo/).test('xfoox');
 var match = new RegExp('(.|\r|\n)*','').exec()[0];
 if (match === 'xfoox') {
-  $FAIL('#1: regExp.exec() leaks match globally');
+  $ERROR('#1: regExp.exec() leaks match globally');
 }
 if (match !== 'undefined') {
-  $FAIL('#2: regExp.exec() must coerce absent first arg to "undefined"');
+  $ERROR('#2: regExp.exec() must coerce absent first arg to "undefined"');
 }
diff --git a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A4_T11.js b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A4_T11.js
index 1913dee0ddaec1997d2f9d467560556a80856752..b7c1fd8cf7c74d129cccb1bfb3eaf0e0c1fe8531 100644
--- a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A4_T11.js
+++ b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A4_T11.js
@@ -9,7 +9,6 @@ es5id: 15.10.6.2_A4_T11
 description: >
     Call first exec, then set re.lastIndex = {valueOf:function(){throw
     "intoint";}} and again call exec
-includes: [$FAIL.js]
 ---*/
 
 var __re = /(?:ab|cd)\d?/g;
@@ -48,7 +47,7 @@ __re.lastIndex = __obj;
 
 //CHECK#5
 try {
-  $FAIL('#5.1: __obj = {valueOf:function(){throw "intoint";}}; __re.lastIndex = __obj; __executed = __re.exec("aacd2233ab12nm444ab42") throw "intoint". Actual: ' + (__re.exec("aacd2233ab12nm444ab42")));
+  $ERROR('#5.1: __obj = {valueOf:function(){throw "intoint";}}; __re.lastIndex = __obj; __executed = __re.exec("aacd2233ab12nm444ab42") throw "intoint". Actual: ' + (__re.exec("aacd2233ab12nm444ab42")));
 } catch (e) {
 	if (e !== "intoint") {
 		$ERROR('#5.2: __obj = {valueOf:function(){throw "intoint";}}; __re.lastIndex = __obj; __executed = __re.exec("aacd2233ab12nm444ab42")  throw "intoint". Actual: ' + (e));
diff --git a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A9.js b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A9.js
index 90957d4c42eca54f7119bc6a72c389b7f249d92d..a87832dc4fe5a02e0d73cbd8e1695b3ffe264c25 100644
--- a/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A9.js
+++ b/test/built-ins/RegExp/prototype/exec/S15.10.6.2_A9.js
@@ -9,12 +9,11 @@ es5id: 15.10.6.2_A9
 description: >
     Checking if deleting the RegExp.prototype.exec.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if ((RegExp.prototype.exec.hasOwnProperty('length') !== true)) {
-  $FAIL('#0: RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
+  $ERROR('#0: RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
 }
 
 //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/global/S15.10.7.2_A10.js b/test/built-ins/RegExp/prototype/global/S15.10.7.2_A10.js
index c7e605d48928b3cd8a885636240e88c0a31914d2..4c346ebe4e1bcf520c9e5e41e5ce3622e0c4a011 100644
--- a/test/built-ins/RegExp/prototype/global/S15.10.7.2_A10.js
+++ b/test/built-ins/RegExp/prototype/global/S15.10.7.2_A10.js
@@ -5,14 +5,14 @@
 info: The RegExp.prototype global property does not have a set accessor
 es5id: 15.10.7.2_A10
 description: Checking if varying the global property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#1
 if (__re.hasOwnProperty('global') !== true) {
-  $FAIL('#1: __re = RegExp.prototype; __re.hasOwnProperty(\'global\') === true');
+  $ERROR('#1: __re = RegExp.prototype; __re.hasOwnProperty(\'global\') === true');
 }
 
 var __sample = /^|^/;
diff --git a/test/built-ins/RegExp/prototype/global/S15.10.7.2_A8.js b/test/built-ins/RegExp/prototype/global/S15.10.7.2_A8.js
index 96519723a66b1c747531d9197a0b1f1fe0a05558..4826409699570f4817cd41081a4ace0c60d134ef 100644
--- a/test/built-ins/RegExp/prototype/global/S15.10.7.2_A8.js
+++ b/test/built-ins/RegExp/prototype/global/S15.10.7.2_A8.js
@@ -7,14 +7,13 @@ es5id: 15.10.7.2_A8
 description: >
     Checking if enumerating the global property of RegExp.prototype
     fails
-includes: [$FAIL.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#0
 if (__re.hasOwnProperty('global') !== true) {
-  $FAIL('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'global\') === true');
+  $ERROR('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'global\') === true');
 }
 
  //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/global/S15.10.7.2_A9.js b/test/built-ins/RegExp/prototype/global/S15.10.7.2_A9.js
index cdc581ef1d57b64c989a230acb9b6fb85333831c..9f50c7a62202d511548f62f4dbbf8879d4c5af69 100644
--- a/test/built-ins/RegExp/prototype/global/S15.10.7.2_A9.js
+++ b/test/built-ins/RegExp/prototype/global/S15.10.7.2_A9.js
@@ -7,14 +7,13 @@ info: >
     DontDelete
 es5id: 15.10.7.2_A9
 description: Checking if deleting the global property succeeds
-includes: [$FAIL.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#0
 if (__re.hasOwnProperty('global') !== true) {
-  $FAIL('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'global\') === true');
+  $ERROR('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'global\') === true');
 }
 
 //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A10.js b/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A10.js
index 923032369d5e82350f81f4d5b16ea327434282a7..5f1f2fb681a9fc3ed4610ca0751d8ccd0b27ea35 100644
--- a/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A10.js
+++ b/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A10.js
@@ -5,14 +5,14 @@
 info: The RegExp.prototype ignoreCase property does not have a set accessor
 es5id: 15.10.7.3_A10
 description: Checking if varying the ignoreCase property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#1
 if (__re.hasOwnProperty('ignoreCase') !== true) {
-  $FAIL('#1: __re = RegExp.prototype; __re.hasOwnProperty(\'ignoreCase\') === true');
+  $ERROR('#1: __re = RegExp.prototype; __re.hasOwnProperty(\'ignoreCase\') === true');
 }
 
 var __sample = /a|b|c/;
diff --git a/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A8.js b/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A8.js
index b0995d5558e447bd7ea231199145a9ef2164db66..7969581b14bae34bbebad4f25757de55de709afc 100644
--- a/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A8.js
+++ b/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A8.js
@@ -7,14 +7,13 @@ es5id: 15.10.7.3_A8
 description: >
     Checking if enumerating the ignoreCase property of
     RegExp.prototype fails
-includes: [$FAIL.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#0
 if (__re.hasOwnProperty('ignoreCase') !== true) {
-  $FAIL('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'ignoreCase\') === true');
+  $ERROR('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'ignoreCase\') === true');
 }
 
  //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A9.js b/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A9.js
index bb2ef1148d894d20eb910a6db3a81f9f95d21ed2..44479d91490131d0acdb9f019fdf0096c89587f3 100644
--- a/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A9.js
+++ b/test/built-ins/RegExp/prototype/ignoreCase/S15.10.7.3_A9.js
@@ -7,14 +7,13 @@ info: >
     DontDelete
 es5id: 15.10.7.3_A9
 description: Checking if deleting the ignoreCase property succeeds
-includes: [$FAIL.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#0
 if (__re.hasOwnProperty('ignoreCase') !== true) {
-  $FAIL('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'ignoreCase\') === true');
+  $ERROR('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'ignoreCase\') === true');
 }
 
 //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/lastIndex/S15.10.7.5_A8.js b/test/built-ins/RegExp/prototype/lastIndex/S15.10.7.5_A8.js
index fcbb5f9b3061086d5e46a558cb1008ff9575350a..70c252043c5d3e03ee915d6523dd0a0fbc817857 100644
--- a/test/built-ins/RegExp/prototype/lastIndex/S15.10.7.5_A8.js
+++ b/test/built-ins/RegExp/prototype/lastIndex/S15.10.7.5_A8.js
@@ -7,14 +7,13 @@ es5id: 15.10.7.5_A8
 description: >
     Checking if enumerating the lastIndex property of RegExp instance
     fails
-includes: [$FAIL.js]
 ---*/
 
 var __re = new RegExp("A?B");
 
 //CHECK#0
 if (__re.hasOwnProperty('lastIndex') !== true) {
-  $FAIL('#0: __re = new RegExp("A?B"); __re.hasOwnProperty(\'lastIndex\') === true');
+  $ERROR('#0: __re = new RegExp("A?B"); __re.hasOwnProperty(\'lastIndex\') === true');
 }
 
  //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/lastIndex/S15.10.7.5_A9.js b/test/built-ins/RegExp/prototype/lastIndex/S15.10.7.5_A9.js
index fcd56a21de2c88089a3e6f081afe4d75596151a3..8b53970970b6826ad064f1b79d296239538b303e 100644
--- a/test/built-ins/RegExp/prototype/lastIndex/S15.10.7.5_A9.js
+++ b/test/built-ins/RegExp/prototype/lastIndex/S15.10.7.5_A9.js
@@ -5,14 +5,14 @@
 info: The RegExp instance lastIndex property has the attribute DontDelete
 es5id: 15.10.7.5_A9
 description: Checking if deleting the lastIndex property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var __re = new RegExp;
 
 //CHECK#0
 if (__re.hasOwnProperty('lastIndex') !== true) {
-  $FAIL('#0: __re = new RegExp; __re.hasOwnProperty(\'lastIndex\') === true');
+  $ERROR('#0: __re = new RegExp; __re.hasOwnProperty(\'lastIndex\') === true');
 }
 
 verifyNotConfigurable(__re, "lastIndex");
diff --git a/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A10.js b/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A10.js
index 6b6802344aed2329669b94d97d86b4af634cbaca..8dca08645e6e8690333ed5232f7d3716ed6497a2 100644
--- a/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A10.js
+++ b/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A10.js
@@ -5,14 +5,14 @@
 info: The RegExp.prototype multiline property does not have a set accessor
 es5id: 15.10.7.4_A10
 description: Checking if varying the multiline property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#1
 if (__re.hasOwnProperty('multiline') !== true) {
-  $FAIL('#1: __re = RegExp.prototype; __re.hasOwnProperty(\'multiline\') === true');
+  $ERROR('#1: __re = RegExp.prototype; __re.hasOwnProperty(\'multiline\') === true');
 }
 
 var __sample = /\n/;
diff --git a/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A8.js b/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A8.js
index 09a896e6020db92f9712e51152158a2415c80b3a..01344abce08c55050d5413e547eef5c53d14a2f3 100644
--- a/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A8.js
+++ b/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A8.js
@@ -7,14 +7,13 @@ es5id: 15.10.7.4_A8
 description: >
     Checking if enumerating the multiline property of RegExp.prototype
     fails
-includes: [$FAIL.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#0
 if (__re.hasOwnProperty('multiline') !== true) {
-  $FAIL('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'multiline\') === true');
+  $ERROR('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'multiline\') === true');
 }
 
  //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A9.js b/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A9.js
index e2e3c308c6e6a73a7a42ed4152adbaec02632687..04ae87f8e84425c30de8afb47798906c024d7cde 100644
--- a/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A9.js
+++ b/test/built-ins/RegExp/prototype/multiline/S15.10.7.4_A9.js
@@ -7,14 +7,13 @@ info: >
     DontDelete
 es5id: 15.10.7.4_A9
 description: Checking if deleting the multiline property succeeds
-includes: [$FAIL.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#0
 if (__re.hasOwnProperty('multiline') !== true) {
-  $FAIL('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'multiline\') === true');
+  $ERROR('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'multiline\') === true');
 }
 
 //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/source/S15.10.7.1_A10.js b/test/built-ins/RegExp/prototype/source/S15.10.7.1_A10.js
index 85e86d5f43eaaaa75014ad14f75771ac1e44b7aa..4c36f23d2dfb0c38bec5ed1dd6dd1ec51b9e672e 100644
--- a/test/built-ins/RegExp/prototype/source/S15.10.7.1_A10.js
+++ b/test/built-ins/RegExp/prototype/source/S15.10.7.1_A10.js
@@ -5,14 +5,14 @@
 info: The RegExp.prototype source property does not have a set accessor
 es5id: 15.10.7.1_A10
 description: Checking if varying the source property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#1
 if (__re.hasOwnProperty('source') !== true) {
-  $FAIL('#1: __re = RegExp.prototype; __re.hasOwnProperty(\'source\') === true');
+  $ERROR('#1: __re = RegExp.prototype; __re.hasOwnProperty(\'source\') === true');
 }
 
 var __sample = /./;
diff --git a/test/built-ins/RegExp/prototype/source/S15.10.7.1_A8.js b/test/built-ins/RegExp/prototype/source/S15.10.7.1_A8.js
index 22941fbf369816968eb7bfc4d4da7989674f15f6..bf9c204b797a21fc9be6e4cf514b5ff1c9ab458f 100644
--- a/test/built-ins/RegExp/prototype/source/S15.10.7.1_A8.js
+++ b/test/built-ins/RegExp/prototype/source/S15.10.7.1_A8.js
@@ -7,14 +7,13 @@ es5id: 15.10.7.1_A8
 description: >
     Checking if enumerating the source property of RegExp.prototype
     fails
-includes: [$FAIL.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#0
 if (__re.hasOwnProperty('source') !== true) {
-	$FAIL('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'source\') === true');
+	$ERROR('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'source\') === true');
 }
 
  //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/source/S15.10.7.1_A9.js b/test/built-ins/RegExp/prototype/source/S15.10.7.1_A9.js
index e5606e144f3d820a2d7e5821b300138f70a20286..7567565bdf208945b88a62136f4ba65a910dec32 100644
--- a/test/built-ins/RegExp/prototype/source/S15.10.7.1_A9.js
+++ b/test/built-ins/RegExp/prototype/source/S15.10.7.1_A9.js
@@ -7,14 +7,13 @@ info: >
     DontDelete
 es5id: 15.10.7.1_A9
 description: Checking if deleting the source property succeeds
-includes: [$FAIL.js]
 ---*/
 
 var __re = RegExp.prototype;
 
 //CHECK#0
 if (__re.hasOwnProperty('source') !== true) {
-	$FAIL('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'source\') === true');
+	$ERROR('#0: __re = RegExp.prototype; __re.hasOwnProperty(\'source\') === true');
 }
 
 //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/test/S15.10.6.3_A10.js b/test/built-ins/RegExp/prototype/test/S15.10.6.3_A10.js
index 331a328141414f3b3d68a2262b64d0292d35d141..2cd4e78079042f4c2c0da9abf3aa2a3a3a298950 100644
--- a/test/built-ins/RegExp/prototype/test/S15.10.6.3_A10.js
+++ b/test/built-ins/RegExp/prototype/test/S15.10.6.3_A10.js
@@ -5,12 +5,12 @@
 info: The RegExp.prototype.test.length property has the attribute ReadOnly
 es5id: 15.10.6.3_A10
 description: Checking if varying the RegExp.prototype.test.length property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (RegExp.prototype.test.hasOwnProperty('length') !== true) {
-  $FAIL('#1: RegExp.prototype.test.hasOwnProperty(\'length\') === true');
+  $ERROR('#1: RegExp.prototype.test.hasOwnProperty(\'length\') === true');
 }
 
 var __obj = RegExp.prototype.test.length;
diff --git a/test/built-ins/RegExp/prototype/test/S15.10.6.3_A11.js b/test/built-ins/RegExp/prototype/test/S15.10.6.3_A11.js
index 3e1ce9f1b0916f8ed689ba229b3a39abe99755d2..02bed07d0d65579bb3cffb9484a67cdbcbc134d0 100644
--- a/test/built-ins/RegExp/prototype/test/S15.10.6.3_A11.js
+++ b/test/built-ins/RegExp/prototype/test/S15.10.6.3_A11.js
@@ -5,12 +5,11 @@
 info: The length property of the test method is 1
 es5id: 15.10.6.3_A11
 description: Checking RegExp.prototype.test.length
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (RegExp.prototype.test.hasOwnProperty("length") !== true) {
-  $FAIL('#1: RegExp.prototype.test.hasOwnProperty(\'length\') === true');
+  $ERROR('#1: RegExp.prototype.test.hasOwnProperty(\'length\') === true');
 }
 
 //CHECK#2
diff --git a/test/built-ins/RegExp/prototype/test/S15.10.6.3_A9.js b/test/built-ins/RegExp/prototype/test/S15.10.6.3_A9.js
index 1fea4a6668cec879f25226bdaec0c8f0be4baa2f..ccb8ad2d86d06a3430e3a017f9541b2f52fd2ca6 100644
--- a/test/built-ins/RegExp/prototype/test/S15.10.6.3_A9.js
+++ b/test/built-ins/RegExp/prototype/test/S15.10.6.3_A9.js
@@ -7,12 +7,11 @@ info: >
     DontDelete
 es5id: 15.10.6.3_A9
 description: Checking if deleting RegExp.prototype.test.length property fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if ((RegExp.prototype.exec.hasOwnProperty('length') !== true)) {
-  $FAIL('#0: RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
+  $ERROR('#0: RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
 }
 
 //CHECK#1
diff --git a/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A10.js b/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A10.js
index ff7e939601dd66241ee1f3214dcddb4b33d33b86..ce3af838448c55dc749c2c3de756ba7e00f7b0db 100644
--- a/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A10.js
+++ b/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A10.js
@@ -7,12 +7,12 @@ es5id: 15.10.6.4_A10
 description: >
     Checking if varying the RegExp.prototype.toString.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //CHECK#1
 if (RegExp.prototype.toString.hasOwnProperty('length') !== true) {
-	$FAIL('#1: RegExp.prototype.toString.hasOwnProperty(\'length\') === true');
+	$ERROR('#1: RegExp.prototype.toString.hasOwnProperty(\'length\') === true');
 }
 
 var __obj = RegExp.prototype.toString.length;
diff --git a/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A11.js b/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A11.js
index dbd81d881d4dec51136915c22e3b0c6d771749d9..a54502d5c341f1930b011fa244fee4d7e472e1fa 100644
--- a/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A11.js
+++ b/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A11.js
@@ -5,12 +5,11 @@
 info: The length property of the toString method is 1
 es5id: 15.10.6.4_A11
 description: Checking RegExp.prototype.toString.length
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (RegExp.prototype.toString.hasOwnProperty("length") !== true) {
-	$FAIL('#1: RegExp.prototype.toString.hasOwnProperty(\'length\') === true');
+	$ERROR('#1: RegExp.prototype.toString.hasOwnProperty(\'length\') === true');
 }
 
 //CHECK#2
diff --git a/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A9.js b/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A9.js
index 19482128faa8e001bfb3d622818e4d16095dbd7b..4236a59a62298f31169fdaace1e446baeaed8612 100644
--- a/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A9.js
+++ b/test/built-ins/RegExp/prototype/toString/S15.10.6.4_A9.js
@@ -9,12 +9,11 @@ es5id: 15.10.6.4_A9
 description: >
     Checking if deleting the RegExp.prototype.toString.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#0
 if ((RegExp.prototype.toString.hasOwnProperty('length') !== true)) {
-	$FAIL('#0: RegExp.prototype.toString.hasOwnProperty(\'length\') === true');
+	$ERROR('#0: RegExp.prototype.toString.hasOwnProperty(\'length\') === true');
 }
 
 //CHECK#1
diff --git a/test/built-ins/String/S15.5.5_A1_T1.js b/test/built-ins/String/S15.5.5_A1_T1.js
index c4341ab34d83785bfb27745300aaa941ad9b380c..b5d7bdde347e3a70b634f4c64ff75997671fa4da 100644
--- a/test/built-ins/String/S15.5.5_A1_T1.js
+++ b/test/built-ins/String/S15.5.5_A1_T1.js
@@ -5,7 +5,6 @@
 info: String instance has not [[call]] property
 es5id: 15.5.5_A1_T1
 description: Create new String and try call it
-includes: [$FAIL.js]
 ---*/
 
 var __str = new String;
@@ -14,7 +13,7 @@ var __str = new String;
 //CHECK#1
 try {
   __str();
-  $FAIL('#1: __str = new String; __str() lead to throwing exception');
+  $ERROR('#1: __str = new String; __str() lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/String/S15.5.5_A1_T2.js b/test/built-ins/String/S15.5.5_A1_T2.js
index eb24a1912b7afadfafa902fc6e8db263938cb823..f7c992b5932f73d6079ceabaad36be8a7555ded4 100644
--- a/test/built-ins/String/S15.5.5_A1_T2.js
+++ b/test/built-ins/String/S15.5.5_A1_T2.js
@@ -5,14 +5,13 @@
 info: String instance has not [[call]] property
 es5id: 15.5.5_A1_T2
 description: Checking if creating new "String("a|b")()" fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 try {
   String("a|b")();
-  $FAIL('#1: String("a|b")() lead to throwing exception');
+  $ERROR('#1: String("a|b")() lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/String/S15.5.5_A2_T1.js b/test/built-ins/String/S15.5.5_A2_T1.js
index 47121d512200350b27ae56039732745c85204364..ed236183ab1f5ef85754af675f9dd2ae7484a291 100644
--- a/test/built-ins/String/S15.5.5_A2_T1.js
+++ b/test/built-ins/String/S15.5.5_A2_T1.js
@@ -5,7 +5,6 @@
 info: String instance has not [[construct]] property
 es5id: 15.5.5_A2_T1
 description: Create new string object and try new created_string
-includes: [$FAIL.js]
 ---*/
 
 var __str = new Object("");
@@ -14,7 +13,7 @@ var __str = new Object("");
 //CHECK#1
 try {
   new __str;
-  $FAIL('#1: __str = new Object(""); "new __str" lead to throwing exception');
+  $ERROR('#1: __str = new Object(""); "new __str" lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/String/S15.5.5_A2_T2.js b/test/built-ins/String/S15.5.5_A2_T2.js
index 3cf9079f085ca0beb85012e437d28fa0b5f18773..6281a6daff82ea60d596a716f476ef9f75b31caf 100644
--- a/test/built-ins/String/S15.5.5_A2_T2.js
+++ b/test/built-ins/String/S15.5.5_A2_T2.js
@@ -5,14 +5,13 @@
 info: String instance has not [[construct]] property
 es5id: 15.5.5_A2_T2
 description: Checking if creating "new String" fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 try {
   new new String;
-  $FAIL('#1: "new new String" lead to throwing exception');
+  $ERROR('#1: "new new String" lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/String/fromCharCode/S15.5.3.2_A4.js b/test/built-ins/String/fromCharCode/S15.5.3.2_A4.js
index 432329e2cc7c43eaf5007899681230ddcd0f659f..daacbbce8f98cc233b80bf04983bbf64e28b34eb 100644
--- a/test/built-ins/String/fromCharCode/S15.5.3.2_A4.js
+++ b/test/built-ins/String/fromCharCode/S15.5.3.2_A4.js
@@ -6,7 +6,6 @@ info: String.fromCharCode has not [[construct]] method
 es5id: 15.5.3.2_A4
 description: Checking if creating "new String.fromCharCode" fails
 includes:
-    - $FAIL.js
     - Test262Error.js
 ---*/
 
@@ -18,7 +17,7 @@ delete String.fromCharCode;
 //CHECK#1
 try {
   var __obj = new __fcc__func(65,66,66,65);
-  $FAIL('#1: __fcc__func = String.fromCharCode; var __obj = new __fcc__func(65,66,66,65) lead to throwing exception');
+  $ERROR('#1: __fcc__func = String.fromCharCode; var __obj = new __fcc__func(65,66,66,65) lead to throwing exception');
 } catch (e) {
     if (e instanceof Test262Error) throw e;
 }
diff --git a/test/built-ins/String/prototype/S15.5.3.1_A2.js b/test/built-ins/String/prototype/S15.5.3.1_A2.js
index 7d54a617a04a9a77d99edf81d6ac7841d558d5d2..fac9d45a52829c75e0b2efcc87b6d20b9440116e 100644
--- a/test/built-ins/String/prototype/S15.5.3.1_A2.js
+++ b/test/built-ins/String/prototype/S15.5.3.1_A2.js
@@ -5,13 +5,12 @@
 info: The String.prototype property has the attribute DontEnum
 es5id: 15.5.3.1_A2
 description: Checking if enumerating the String.prototype property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.hasOwnProperty('prototype'))) {
-  $FAIL('#0: String.hasOwnProperty(\'prototype\') return true. Actual: '+String.hasOwnProperty('prototype'));
+  $ERROR('#0: String.hasOwnProperty(\'prototype\') return true. Actual: '+String.hasOwnProperty('prototype'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/S15.5.3.1_A3.js b/test/built-ins/String/prototype/S15.5.3.1_A3.js
index eddfc2e48ff32604cf56f9e5b3d8398e3c482bf7..ae47596579ad7d01b109c9a401af4ddc7b331690 100644
--- a/test/built-ins/String/prototype/S15.5.3.1_A3.js
+++ b/test/built-ins/String/prototype/S15.5.3.1_A3.js
@@ -5,13 +5,13 @@
 info: The String.prototype property has the attribute DontDelete
 es5id: 15.5.3.1_A3
 description: Checking if deleting the String.prototype property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.hasOwnProperty('prototype'))) {
-  $FAIL('#1: String.hasOwnProperty(\'prototype\') return true. Actual: '+String.hasOwnProperty('prototype'));
+  $ERROR('#1: String.hasOwnProperty(\'prototype\') return true. Actual: '+String.hasOwnProperty('prototype'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/S15.5.3.1_A4.js b/test/built-ins/String/prototype/S15.5.3.1_A4.js
index fb570b94153ed8470bbcaa8749552b36289d458a..e94cfe27ed916108edd44c64a7d97b1feb131f41 100644
--- a/test/built-ins/String/prototype/S15.5.3.1_A4.js
+++ b/test/built-ins/String/prototype/S15.5.3.1_A4.js
@@ -5,13 +5,13 @@
 info: The String.prototype property has the attribute ReadOnly
 es5id: 15.5.3.1_A4
 description: Checking if varying the String.prototype property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.hasOwnProperty('prototype'))) {
-  $FAIL('#1: String.hasOwnProperty(\'prototype\') return true. Actual: '+String.hasOwnProperty('prototype'));
+  $ERROR('#1: String.hasOwnProperty(\'prototype\') return true. Actual: '+String.hasOwnProperty('prototype'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/S15.5.4_A2.js b/test/built-ins/String/prototype/S15.5.4_A2.js
index e3efd8db9536c6a8f23784213a8b9311b37bcba7..30c15bfcb3acfd0dceb50339c1e327bb66f028d3 100644
--- a/test/built-ins/String/prototype/S15.5.4_A2.js
+++ b/test/built-ins/String/prototype/S15.5.4_A2.js
@@ -5,14 +5,13 @@
 info: The String prototype object is itself not a String object
 es5id: 15.5.4_A2
 description: Checking String.prototype
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 try {
   (String.prototype !="");
-  $FAIL('#1: "(String.prototype !="");" lead to throwing exception. Actual: '+(String.prototype !=""));
+  $ERROR('#1: "(String.prototype !="");" lead to throwing exception. Actual: '+(String.prototype !=""));
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: "(String.prototype !="")" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/String/prototype/charAt/S15.5.4.4_A5.js b/test/built-ins/String/prototype/charAt/S15.5.4.4_A5.js
index aa1e114b8c09743d9d45af5f49a6899452d8936d..14a3144b3becb3ba0eccfd973743515b9333083f 100644
--- a/test/built-ins/String/prototype/charAt/S15.5.4.4_A5.js
+++ b/test/built-ins/String/prototype/charAt/S15.5.4.4_A5.js
@@ -7,7 +7,6 @@ info: >
     the this value as its argument
 es5id: 15.5.4.4_A5
 description: Change toString function, it trow exception, and call charAt()
-includes: [$FAIL.js]
 ---*/
 
 var __obj={
@@ -20,7 +19,7 @@ var __obj={
 //CHECK#1
 try {
   var x = __obj.charAt();
-  $FAIL('#1: __obj={valueOf:1,toString:function(){throw \'intostring\'},charAt:String.prototype.charAt}; "var x = __obj.charAt()" lead to throwing exception');
+  $ERROR('#1: __obj={valueOf:1,toString:function(){throw \'intostring\'},charAt:String.prototype.charAt}; "var x = __obj.charAt()" lead to throwing exception');
 } catch (e) {
   if (e !== 'intostring') {
     $ERROR('#1.1: Exception === \'intostring\'. Actual: exception ==='+e ); 
diff --git a/test/built-ins/String/prototype/charAt/S15.5.4.4_A7.js b/test/built-ins/String/prototype/charAt/S15.5.4.4_A7.js
index f7d4f52afbd9fd1e8e4a3e548637d2c104ffa8da..5afab205b94e6c6e926c8416b99a041a453eb384 100644
--- a/test/built-ins/String/prototype/charAt/S15.5.4.4_A7.js
+++ b/test/built-ins/String/prototype/charAt/S15.5.4.4_A7.js
@@ -5,14 +5,13 @@
 info: String.prototype.charAt can't be used as constructor
 es5id: 15.5.4.4_A7
 description: Checking if creating the String.prototype.charAt object fails
-includes: [$FAIL.js]
 ---*/
 
 var __FACTORY = String.prototype.charAt;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.charAt; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.charAt; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.2: undefined = 1 throw a TypeError. Actual: ' + (e));  
diff --git a/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A4.js b/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A4.js
index 33a2360a1965c94488ce77998ca2dfcd9e718877..ee95e497a7dc7caa1be7fc668cce2439d35d15a3 100644
--- a/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A4.js
+++ b/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A4.js
@@ -7,7 +7,6 @@ info: >
     it the this value as its argument
 es5id: 15.5.4.5_A4
 description: Change toString function, it trow exception, and call charCodeAt()
-includes: [$FAIL.js]
 ---*/
 
 var __obj={
@@ -20,7 +19,7 @@ var __obj={
 //CHECK#1
 try {
   var x = __obj.charCodeAt();
-  $FAIL('#1:  "var x = __obj.charCodeAt()" lead to throwing exception');
+  $ERROR('#1:  "var x = __obj.charCodeAt()" lead to throwing exception');
 } catch (e) {
   if (e !== 'intostring') {
     $ERROR('#1.1: Exception === \'intostring\'. Actual: exception ==='+e ); 
diff --git a/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A7.js b/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A7.js
index c93d26f94772f8ad745b444edaaf1305c802ef2e..cdefce3222e9ef8dc0ea46b044b47e02232c50e0 100644
--- a/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A7.js
+++ b/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A7.js
@@ -6,7 +6,6 @@ info: String.prototype.charCodeAt can't be used as constructor
 es5id: 15.5.4.5_A7
 description: Checking if creating the String.prototype.charCodeAt object fails
 includes:
-    - $FAIL.js
     - Test262Error.js
 ---*/
 
@@ -14,7 +13,7 @@ var __FACTORY = String.prototype.charCodeAt;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.charCodeAt; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.charCodeAt; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
     if (e instanceof Test262Error) throw e;
 }
diff --git a/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A8.js b/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A8.js
index 7aa9fa502e125b20afa6be689cf2c2f88f2b9a5a..e70cadbd2224765d5a2d3e358ee0f188f8476ef6 100644
--- a/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A8.js
+++ b/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A8.js
@@ -7,13 +7,12 @@ es5id: 15.5.4.5_A8
 description: >
     Checking if enumerating the String.prototype.charCodeAt.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.charCodeAt.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.charCodeAt.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.charCodeAt.hasOwnProperty('length')); 
+  $ERROR('#0: String.prototype.charCodeAt.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.charCodeAt.hasOwnProperty('length')); 
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A9.js b/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A9.js
index 104e94654ba982060df7621df7b2a27245a17f10..92187de2ebdf82c42d3263f6a0a7969de4f54d79 100644
--- a/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A9.js
+++ b/test/built-ins/String/prototype/charCodeAt/S15.5.4.5_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.5_A9
 description: >
     Checking if deleting the String.prototype.charCodeAt.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.charCodeAt.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.charCodeAt.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.charCodeAt.hasOwnProperty('length')); 
+  $ERROR('#0: String.prototype.charCodeAt.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.charCodeAt.hasOwnProperty('length')); 
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.charCodeAt.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.charCodeAt.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.charCodeAt.length; String.prototype.charCodeAt.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.charCodeAt.hasOwnProperty('length')); 
+  $ERROR('#2: delete String.prototype.charCodeAt.length; String.prototype.charCodeAt.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.charCodeAt.hasOwnProperty('length')); 
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/concat/S15.5.4.6_A4_T2.js b/test/built-ins/String/prototype/concat/S15.5.4.6_A4_T2.js
index 0b6a1fde7ef2086e1113b8c5311c101f0a3111c8..e99f39f8ad538ef32887901af4d00ffb955b83b5 100644
--- a/test/built-ins/String/prototype/concat/S15.5.4.6_A4_T2.js
+++ b/test/built-ins/String/prototype/concat/S15.5.4.6_A4_T2.js
@@ -7,7 +7,6 @@ info: >
     giving it the this value as its argument
 es5id: 15.5.4.6_A4_T2
 description: Override toString function onto function, that throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __instance = {toString:function(){throw "intostring";}};
@@ -19,7 +18,7 @@ __instance.concat = String.prototype.concat;
 //CHECK#1
 try {
   String.prototype.concat.call(__instance,__obj, notexist);
-  $FAIL('#1: "String.prototype.concat.call(__instance,__obj, notexist)" lead to throwing exception');
+  $ERROR('#1: "String.prototype.concat.call(__instance,__obj, notexist)" lead to throwing exception');
 } catch (e) {
   if (e !== "intostring") {
     $ERROR('#1: e === "intostring". Actual: '+e ); 
diff --git a/test/built-ins/String/prototype/concat/S15.5.4.6_A7.js b/test/built-ins/String/prototype/concat/S15.5.4.6_A7.js
index c90bf5b822601b4662b90223abbdc72ec6803c33..9e13e3393f918e8569e8e8cc85398ec645b21466 100644
--- a/test/built-ins/String/prototype/concat/S15.5.4.6_A7.js
+++ b/test/built-ins/String/prototype/concat/S15.5.4.6_A7.js
@@ -6,7 +6,6 @@ info: String.prototype.concat can't be used as constructor
 es5id: 15.5.4.6_A7
 description: Checking if creating the String.prototype.concat object fails
 includes:
-    - $FAIL.js
     - Test262Error.js
 ---*/
 
@@ -14,7 +13,7 @@ var __FACTORY = String.prototype.concat;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.concat; "__instance = new __FACTORY" lead throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.concat; "__instance = new __FACTORY" lead throwing exception');
 } catch (e) {
     if (e instanceof Test262Error) throw e;
 }
diff --git a/test/built-ins/String/prototype/concat/S15.5.4.6_A8.js b/test/built-ins/String/prototype/concat/S15.5.4.6_A8.js
index ed2660172f305396d238ae06b0e340922a201ae5..51e74575b7118f1fcdb498a5990d7da69090bc3d 100644
--- a/test/built-ins/String/prototype/concat/S15.5.4.6_A8.js
+++ b/test/built-ins/String/prototype/concat/S15.5.4.6_A8.js
@@ -7,13 +7,12 @@ es5id: 15.5.4.6_A8
 description: >
     Checking if enumerating the String.prototype.concat.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.concat.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.concat.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.concat.hasOwnProperty('length')); 
+  $ERROR('#0: String.prototype.concat.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.concat.hasOwnProperty('length')); 
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/concat/S15.5.4.6_A9.js b/test/built-ins/String/prototype/concat/S15.5.4.6_A9.js
index f381eccf79f3d6e8cd07a5b7e925d944e9b26b56..38eefb0dae2739d6626097fcb215c4f4ca0b041c 100644
--- a/test/built-ins/String/prototype/concat/S15.5.4.6_A9.js
+++ b/test/built-ins/String/prototype/concat/S15.5.4.6_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.6_A9
 description: >
     Checking if deleting the String.prototype.concat.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.concat.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.concat.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.concat.hasOwnProperty('length')); 
+  $ERROR('#0: String.prototype.concat.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.concat.hasOwnProperty('length')); 
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.concat.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.concat.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.concat.length; String.prototype.concat.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.concat.hasOwnProperty('length')); 
+  $ERROR('#2: delete String.prototype.concat.length; String.prototype.concat.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.concat.hasOwnProperty('length')); 
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A10.js b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A10.js
index e9f6ceed195f024379a8e9c07c6f9ec9802eebf4..a5725856e05a3cce53f615550f4c7d4b21dd6f86 100644
--- a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A10.js
+++ b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A10.js
@@ -7,13 +7,13 @@ es5id: 15.5.4.7_A10
 description: >
     Checking if varying the String.prototype.indexOf.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.indexOf.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.indexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.indexOf.hasOwnProperty('length')); 
+  $ERROR('#1: String.prototype.indexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.indexOf.hasOwnProperty('length')); 
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T1.js b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T1.js
index 5ab8f6bccb71dd42c4608ee89b6281936c2de128..e3b4caa4cbfe96d3e65c42cc33e289036fcf54da 100644
--- a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T1.js
+++ b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T1.js
@@ -7,7 +7,6 @@ info: >
     Then Call ToString(searchString) and Call ToNumber(position)
 es5id: 15.5.4.7_A4_T1
 description: Override toString and valueOf functions, valueOf throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
@@ -18,7 +17,7 @@ var __str = "ABB\u0041BABAB";
 //CHECK#1
         try {
           var x = __str.indexOf(__obj, __obj2);
-          $FAIL('#1: "var x = __str.indexOf(__obj, __obj2)" lead to throwing exception');
+          $ERROR('#1: "var x = __str.indexOf(__obj, __obj2)" lead to throwing exception');
         } catch (e) {
           if (e!=="intointeger") {
             $ERROR('#1.1: Exception === "intointeger". Actual: '+e); 
diff --git a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T2.js b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T2.js
index 18ef5214b59bba057a5d9cf38f401d9561592be3..874ad14849ce47d0919decd8175893488d297f46 100644
--- a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T2.js
+++ b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T2.js
@@ -9,7 +9,6 @@ es5id: 15.5.4.7_A4_T2
 description: >
     Override toString and valueOf functions, second toString throw
     exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
@@ -20,7 +19,7 @@ var __str = new String("ABB\u0041BABAB");
 //CHECK#1
     try {
       var x = __str.indexOf(__obj, __obj2);
-      $FAIL('#1: "var x = __str.indexOf(__obj, __obj2)" lead to throwing exception');
+      $ERROR('#1: "var x = __str.indexOf(__obj, __obj2)" lead to throwing exception');
     } catch (e) {
       if (e!=="intointeger") {
         $ERROR('#1.1: Exception === "intointeger". Actual: '+e); 
diff --git a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T4.js b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T4.js
index 5ef364a5df234ea4dbd9a344f6416e367492a72e..ab35f45b1f35e999f24fb8d7fe6d846010e27d13 100644
--- a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T4.js
+++ b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T4.js
@@ -7,7 +7,6 @@ info: >
     Then Call ToString(searchString) and Call ToNumber(position)
 es5id: 15.5.4.7_A4_T4
 description: Override toString and valueOf functions, and they throw exceptions
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "intostr";}};
@@ -19,7 +18,7 @@ Number.prototype.indexOf=String.prototype.indexOf;
 //CHECK#1
     try {
       var x = __instance.indexOf(__obj, __obj2);
-      $FAIL('#1: "var x = __instance.indexOf(__obj, __obj2)" lead to throwing exception');
+      $ERROR('#1: "var x = __instance.indexOf(__obj, __obj2)" lead to throwing exception');
     } catch (e) {
       if (e!=="intostr") {
         $ERROR('#1.1: Exception === "intostr". Actual: '+e); 
diff --git a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T5.js b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T5.js
index edaac9b581072558ac5353bfef3b379111faad92..a71a1d72b7d43135925896d7f6e753f1df0b5555 100644
--- a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T5.js
+++ b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A4_T5.js
@@ -9,7 +9,6 @@ es5id: 15.5.4.7_A4_T5
 description: >
     Override toString and valueOf functions, first and second valueOf
     throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}};
@@ -24,7 +23,7 @@ var __instance = new __FACTORY(void 0);
 //CHECK#1
 try {
   var x = __instance.indexOf(__obj, __obj2);
-  $FAIL('#1: "var x = __instance.indexOf(__obj, __obj2)" lead to throwing exception');
+  $ERROR('#1: "var x = __instance.indexOf(__obj, __obj2)" lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e); 
diff --git a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A7.js b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A7.js
index c7f8866c52d61d2e290f00582487af9f607e9366..cc46ccd0c7fb6c8e794ac4036aa62a0e6ac9fe39 100644
--- a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A7.js
+++ b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A7.js
@@ -7,14 +7,13 @@ es5id: 15.5.4.7_A7
 description: Checking if creating the String.prototype.indexOf object fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var __FACTORY = String.prototype.indexOf;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: var __FACTORY = String.prototype.indexOf; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: var __FACTORY = String.prototype.indexOf; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.2: var __FACTORY = String.prototype.indexOf; "__instance = new __FACTORY" throw a TypeError. Actual: ' + (e));  
diff --git a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A9.js b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A9.js
index b09575db91d65a498b9d60962568304f33b956a6..93f5d08883e1b58b3e72f4b3760c33f2bb7490bd 100644
--- a/test/built-ins/String/prototype/indexOf/S15.5.4.7_A9.js
+++ b/test/built-ins/String/prototype/indexOf/S15.5.4.7_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.7_A9
 description: >
     Checking if deleting the String.prototype.indexOf.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.indexOf.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.indexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.indexOf.hasOwnProperty('length')); 
+  $ERROR('#0: String.prototype.indexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.indexOf.hasOwnProperty('length')); 
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.indexOf.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.indexOf.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.indexOf.length; String.prototype.indexOf.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.indexOf.hasOwnProperty('length')); 
+  $ERROR('#2: delete String.prototype.indexOf.length; String.prototype.indexOf.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.indexOf.hasOwnProperty('length')); 
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A10.js b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A10.js
index 3a59f0f6cd9b8c139a36ba470818fb38dd5c94cc..33db1f7c6ac8cea71eb0511835cc2516a684f85b 100644
--- a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A10.js
+++ b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A10.js
@@ -9,13 +9,13 @@ es5id: 15.5.4.8_A10
 description: >
     Checking if varying the String.prototype.lastIndexOf.length
     property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.lastIndexOf.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.lastIndexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.lastIndexOf.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.lastIndexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.lastIndexOf.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T1.js b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T1.js
index eb5962a9deff784c6445a2551253664ad322d23e..24614bd5252d607f8f0e23bb85f7cfac893b0eff 100644
--- a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T1.js
+++ b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T1.js
@@ -7,7 +7,6 @@ info: >
     Then Call ToString(searchString) and Call ToNumber(position)
 es5id: 15.5.4.8_A4_T1
 description: Override toString and valueOf functions, valueOf throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
@@ -18,7 +17,7 @@ var __str = "ABB\u0041BABAB";
 //CHECK#1
         try {
           var x = __str.lastIndexOf(__obj, __obj2);
-          $FAIL('#1: var x = __str.lastIndexOf(__obj, __obj2) lead to throwing exception');
+          $ERROR('#1: var x = __str.lastIndexOf(__obj, __obj2) lead to throwing exception');
         } catch (e) {
           if (e!=="intointeger") {
             $ERROR('#1.1: Exception === "intointeger". Actual: '+e);
diff --git a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T2.js b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T2.js
index 9e4a33ccb7d24f1cb8ea8390cd82f015d797713e..d2527a27b4d56bef5fc9f5f3c169a0874a0ebec1 100644
--- a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T2.js
+++ b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T2.js
@@ -9,7 +9,6 @@ es5id: 15.5.4.8_A4_T2
 description: >
     Override toString and valueOf functions, second toString throw
     exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
@@ -20,7 +19,7 @@ var __str = new String("ABB\u0041BABAB");
 //CHECK#1
     try {
       var x = __str.lastIndexOf(__obj, __obj2);
-      $FAIL('#1: var x = __str.lastIndexOf(__obj, __obj2) lead to throwing exception');
+      $ERROR('#1: var x = __str.lastIndexOf(__obj, __obj2) lead to throwing exception');
     } catch (e) {
       if (e!=="intointeger") {
         $ERROR('#1.1: Exception === "intointeger". Actual: '+e);
diff --git a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T4.js b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T4.js
index 23230be51bc8f58cda958189055e89e7ddf6c5ec..e0661226a65de6fe4085df0fbc104c24580fe43f 100644
--- a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T4.js
+++ b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T4.js
@@ -7,7 +7,6 @@ info: >
     Then Call ToString(searchString) and Call ToNumber(position)
 es5id: 15.5.4.8_A4_T4
 description: Override toString and valueOf functions, and they throw exceptions
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "intostr";}};
@@ -19,7 +18,7 @@ Number.prototype.lastIndexOf=String.prototype.lastIndexOf;
 //CHECK#1
     try {
       var x = __instance.lastIndexOf(__obj, __obj2);
-      $FAIL('#1: var x = __instance.lastIndexOf(__obj, __obj2) lead to throwing exception');
+      $ERROR('#1: var x = __instance.lastIndexOf(__obj, __obj2) lead to throwing exception');
     } catch (e) {
       if (e!=="intostr") {
         $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T5.js b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T5.js
index 58ab508d709f19b1788540b9ffadb9c4dda2eaff..d815059b83e7093dbb42a92219b1f4beee5c00ff 100644
--- a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T5.js
+++ b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A4_T5.js
@@ -9,7 +9,6 @@ es5id: 15.5.4.8_A4_T5
 description: >
     Override toString and valueOf functions, first and second valueOf
     throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}};
@@ -24,7 +23,7 @@ var __instance = new __FACTORY(void 0);
 //CHECK#1
 try {
   var x = __instance.lastIndexOf(__obj, __obj2);
-  $FAIL('#1: var x = __instance.lastIndexOf(__obj, __obj2) lead to throwing exception');
+  $ERROR('#1: var x = __instance.lastIndexOf(__obj, __obj2) lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A7.js b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A7.js
index e813df59bb25e84cb33e6ebf058e6d4bff9b1aea..a9e1972280f980409d74275b07b9183b322e6b8f 100644
--- a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A7.js
+++ b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A7.js
@@ -7,14 +7,13 @@ es5id: 15.5.4.8_A7
 description: Checking if creating the String.prototype.lastIndexOf object fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var __FACTORY = String.prototype.lastIndexOf;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.lastIndexOf; __instance = new __FACTORY lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.lastIndexOf; __instance = new __FACTORY lead to throwing exception');
 } catch (e) {
   $PRINT(e);
 }
diff --git a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A8.js b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A8.js
index f0a253ae5a9d309a60ee764e5fa14fc0d44f2366..d49cac9939cf27bf9d6798dea4f404c5248d6f9b 100644
--- a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A8.js
+++ b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A8.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.8_A8
 description: >
     Checking if enumerating the String.prototype.lastIndexOf.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.lastIndexOf.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.lastIndexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.lastIndexOf.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.lastIndexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.lastIndexOf.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A9.js b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A9.js
index 63f376f36cba59c95f48b4f7b89d31065730879c..d47af8a85fec0cadbb43a1bbb322e5d026d13fa5 100644
--- a/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A9.js
+++ b/test/built-ins/String/prototype/lastIndexOf/S15.5.4.8_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.8_A9
 description: >
     Checking if deleting the String.prototype.lastIndexOf.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.lastIndexOf.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.lastIndexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.lastIndexOf.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.lastIndexOf.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.lastIndexOf.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.lastIndexOf.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.lastIndexOf.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.lastIndexOf.length; String.prototype.lastIndexOf.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.lastIndexOf.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.lastIndexOf.length; String.prototype.lastIndexOf.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.lastIndexOf.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/localeCompare/S15.5.4.9_A7.js b/test/built-ins/String/prototype/localeCompare/S15.5.4.9_A7.js
index 6b86b46c32a71e18ecea6b18cea8aee09e8051ec..fc19c673e0ac60a4867218b0406d4602694729f5 100644
--- a/test/built-ins/String/prototype/localeCompare/S15.5.4.9_A7.js
+++ b/test/built-ins/String/prototype/localeCompare/S15.5.4.9_A7.js
@@ -8,7 +8,6 @@ description: >
     Checking if creating the String.prototype.localeCompare object
     fails
 includes:
-    - $FAIL.js
     - Test262Error.js
 ---*/
 
@@ -16,7 +15,7 @@ var __FACTORY = String.prototype.localeCompare;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.localeCompare; __instance = new __FACTORY lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.localeCompare; __instance = new __FACTORY lead to throwing exception');
 } catch (e) {
     if (e instanceof Test262Error) throw e;
 }
diff --git a/test/built-ins/String/prototype/match/S15.5.4.10_A10.js b/test/built-ins/String/prototype/match/S15.5.4.10_A10.js
index 1a9f0acbd93fb5b150f5e4dc49af021062148a9e..7febd2746fc8c84475f8dfc33ee6750966540652 100644
--- a/test/built-ins/String/prototype/match/S15.5.4.10_A10.js
+++ b/test/built-ins/String/prototype/match/S15.5.4.10_A10.js
@@ -7,13 +7,13 @@ es5id: 15.5.4.10_A10
 description: >
     Checking if varying the String.prototype.match.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.match.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.match.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.match.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.match.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.match.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/match/S15.5.4.10_A1_T11.js b/test/built-ins/String/prototype/match/S15.5.4.10_A1_T11.js
index 2f4649a47892edbecfb984c6f6496742ca5dc89f..01c8767ebf7a903ec48072f4850de7bfc6eb613b 100644
--- a/test/built-ins/String/prototype/match/S15.5.4.10_A1_T11.js
+++ b/test/built-ins/String/prototype/match/S15.5.4.10_A1_T11.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.10_A1_T11
 description: >
     Override toString function, toString throw exception, then call
     match (regexp) function with this object as argument
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "intostr";}}
@@ -17,7 +16,7 @@ var __str = "ABB\u0041BABAB";
 //CHECK#1
         try {
           var x = __str.match(__obj);
-          $FAIL('#1: "var x = __str.match(__obj)" lead to throwing exception');
+          $ERROR('#1: "var x = __str.match(__obj)" lead to throwing exception');
         } catch (e) {
           if (e!=="intostr") {
             $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/match/S15.5.4.10_A1_T12.js b/test/built-ins/String/prototype/match/S15.5.4.10_A1_T12.js
index 5b4c0bd0b9e950c0ec812bb2c804de322df8bd1e..9f6049a40ba2d5f8b32be1237393b33d4e1310aa 100644
--- a/test/built-ins/String/prototype/match/S15.5.4.10_A1_T12.js
+++ b/test/built-ins/String/prototype/match/S15.5.4.10_A1_T12.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.10_A1_T12
 description: >
     Override toString and valueOf functions, valueOf throw exception,
     then call match (regexp) function with this object as argument
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}}
@@ -17,7 +16,7 @@ var __str = new String("ABB\u0041BABAB");
 //CHECK#1
     try {
       var x = __str.match(__obj);
-      $FAIL('#1: "var x = __str.match(__obj)" lead to throwing exception');
+      $ERROR('#1: "var x = __str.match(__obj)" lead to throwing exception');
     } catch (e) {
       if (e!=="intostr") {
         $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/match/S15.5.4.10_A7.js b/test/built-ins/String/prototype/match/S15.5.4.10_A7.js
index fa36f4a596f4856f50d1bea7c2cea18b0b64540b..9986a899faa1c1e094612f993d9432af5989e28f 100644
--- a/test/built-ins/String/prototype/match/S15.5.4.10_A7.js
+++ b/test/built-ins/String/prototype/match/S15.5.4.10_A7.js
@@ -6,7 +6,6 @@ info: String.prototype.match can't be used as constructor
 es5id: 15.5.4.10_A7
 description: Checking if creating "String.prototype.match object" fails
 includes:
-    - $FAIL.js
     - Test262Error.js
 ---*/
 
@@ -14,7 +13,7 @@ var __FACTORY = String.prototype.match;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.match; __FACTORY = String.prototype.match; __instance = new __FACTORY lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.match; __FACTORY = String.prototype.match; __instance = new __FACTORY lead to throwing exception');
 } catch (e) {
     if (e instanceof Test262Error) throw e;
 }
diff --git a/test/built-ins/String/prototype/match/S15.5.4.10_A8.js b/test/built-ins/String/prototype/match/S15.5.4.10_A8.js
index 3e24899ef1fb5eeeb9dbb1e712b8992c61071f91..d07bced4db3cd19f7221822fbc88fa85e7e988b9 100644
--- a/test/built-ins/String/prototype/match/S15.5.4.10_A8.js
+++ b/test/built-ins/String/prototype/match/S15.5.4.10_A8.js
@@ -7,13 +7,12 @@ es5id: 15.5.4.10_A8
 description: >
     Checking if enumerating the String.prototype.match.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.match.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.match.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.match.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.match.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.match.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/match/S15.5.4.10_A9.js b/test/built-ins/String/prototype/match/S15.5.4.10_A9.js
index 868d5007e15727e131592095a87c819be3ec347b..14f2a1d47cb4b0be1fba672c3213b5fa23422f0b 100644
--- a/test/built-ins/String/prototype/match/S15.5.4.10_A9.js
+++ b/test/built-ins/String/prototype/match/S15.5.4.10_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.10_A9
 description: >
     Checking if deleting the String.prototype.match.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.match.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.match.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.match.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.match.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.match.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.match.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.match.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.match.length; String.prototype.match.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.match.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.match.length; String.prototype.match.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.match.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A10.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A10.js
index d1cb41ab3e12a03ef39a490e119287f97deb66e8..76846ee1f83d574ae3f0467f6f864113778399e4 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A10.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A10.js
@@ -7,13 +7,13 @@ es5id: 15.5.4.11_A10
 description: >
     Checking if varying the String.prototype.replace.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.replace.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.replace.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.replace.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.replace.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.replace.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A12.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A12.js
index 9200fe9907adfe349a951a170639e8a27c87fc33..5470a715ff00de7936d8c497da3ec1eaada5bfaf 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A12.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A12.js
@@ -6,7 +6,6 @@ info: Call replaceValue passing undefined as the this value
 es5id: 15.5.4.11_A12
 description: replaceValue tests that its this value is undefined
 flags: [onlyStrict]
-includes: [$FAIL.js]
 ---*/
 
 var global = this;
@@ -14,10 +13,10 @@ var global = this;
   "use strict";
 
   if (this === global) {
-    $FAIL('#1: String replace leaks global');
+    $ERROR('#1: String replace leaks global');
   }
   if (this !== undefined) {
-    $FAIL('#2: replaceValue should be called with this===undefined. ' +
+    $ERROR('#2: replaceValue should be called with this===undefined. ' +
           'Actual: ' + this);
   }
   return 'y';
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T11.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T11.js
index fd4e3c4f77d91296964b561363d76d3f4d7189c1..e6da57621ddb649321e124424d4161b72e2301d8 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T11.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T11.js
@@ -8,7 +8,6 @@ description: >
     Call replace (searchValue, replaceValue) function with objects
     arguments of string object. Objects have overrided toString
     function, that throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "insearchValue";}};
@@ -19,7 +18,7 @@ var __str = "ABB\u0041BABAB";
 //CHECK#1
         try {
           var x = __str.replace(__obj,__obj2);
-          $FAIL('#1: "var x = __str.replace(__obj,__obj2)" lead to throwing exception');
+          $ERROR('#1: "var x = __str.replace(__obj,__obj2)" lead to throwing exception');
         } catch (e) {
           if (e!=="insearchValue") {
             $ERROR('#1.1: Exception === "insearchValue". Actual: '+e);
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T12.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T12.js
index 895d4c229a6a58da82f8f06e3bb0a5784e0cf74b..d56fe57fde84af6b8106437318ac308f2865a140 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T12.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T12.js
@@ -9,7 +9,6 @@ description: >
     arguments of String object.  First objects have overrided toString
     and valueOf functions, valueOf throw exception.  Second objects
     have overrided toString function, that throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};}, valueOf:function(){throw "insearchValue";}};
@@ -20,7 +19,7 @@ var __str = new String("ABB\u0041BABAB");
 //CHECK#1
     try {
       var x = __str.replace(__obj, __obj2);
-      $FAIL('#1: "var x = __str.replace(__obj,__obj2)" lead to throwing exception');
+      $ERROR('#1: "var x = __str.replace(__obj,__obj2)" lead to throwing exception');
     } catch (e) {
       if (e!=="insearchValue") {
         $ERROR('#1.1: Exception === "insearchValue". Actual: '+e);
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T13.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T13.js
index 352b1e6f4d9132f4029d8cb160acb8c20f64162e..0a3b6feff89c07438c48710ec3a56594fd5495be 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T13.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T13.js
@@ -9,7 +9,6 @@ description: >
     arguments of string.  First objects have overrided toString and
     valueOf functions.  Second objects have overrided toString
     function, that throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};}, valueOf:function(){return 1;}};
@@ -19,7 +18,7 @@ var __obj2 = {toString:function(){throw "inreplaceValue";}};
 //CHECK#1
 try {
     var x = "ABB\u0041BABAB\u0031BBAA".replace(__obj, __obj2);
-    $FAIL('#1: var x = "ABB\\u0041BABAB\\u0031BBAA".replace(__obj,__obj2) lead to throwing exception');
+    $ERROR('#1: var x = "ABB\\u0041BABAB\\u0031BBAA".replace(__obj,__obj2) lead to throwing exception');
 } catch (e) {
     if (e!=="inreplaceValue") {
         $ERROR('#1.1: Exception === "inreplaceValue". Actual: '+e);
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T15.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T15.js
index a34b7f188dc0daf7f4667f2f6c2ab771f0e4ca5d..6156897ad38934cef51536b20ef20d7c428a0b9e 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T15.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T15.js
@@ -5,7 +5,6 @@
 info: String.prototype.replace (searchValue, replaceValue)
 es5id: 15.5.4.11_A1_T15
 description: Instance is Object, searchValue is regular expression
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return /77/}};
@@ -18,7 +17,7 @@ Object.prototype.replace = String.prototype.replace;
 //CHECK#1
 try {
   var x = __instance.replace(__obj, 1) === "1100.0017001";
-    $FAIL('#1.0: x = __instance.replace(__obj, 1) === "1100.0017001" lead to throwing exception');
+    $ERROR('#1.0: x = __instance.replace(__obj, 1) === "1100.0017001" lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: Exception is instance of TypeError. Actual: '+e);
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T16.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T16.js
index c62bdb509781f645c9fe4005d0da3c5a40ba1c9c..e29fe2002be164f90bd22f87f21c665b674dc5d3 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T16.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A1_T16.js
@@ -5,7 +5,6 @@
 info: String.prototype.replace (searchValue, replaceValue)
 es5id: 15.5.4.11_A1_T16
 description: Instance is Number, searchValue is regular expression
-includes: [$FAIL.js]
 ---*/
 
 var __re = /77/;
@@ -22,7 +21,7 @@ var __obj = {toString:function(){return function(a1,a2,a3){return a2+"z"};}}
 //CHECK#1
 try {
   var x = __instance.replace(__re, __obj) === "1100.007z7001";
-  $FAIL('#1.0: x = __instance.replace(__obj, 1) === "1100.007z7001" lead to throwing exception');
+  $ERROR('#1.0: x = __instance.replace(__obj, 1) === "1100.007z7001" lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: Exception is instance of TypeError. Actual: '+e);
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A7.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A7.js
index db7214356b1b2a7c78c2e53c7c65ae1954f3064a..9fddc5ad956ec424af3ec119bcb67fb522664b1d 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A7.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A7.js
@@ -6,7 +6,6 @@ info: String.prototype.replace can't be used as constructor
 es5id: 15.5.4.11_A7
 description: Checking if creating the String.prototype.replace object fails
 includes:
-    - $FAIL.js
     - Test262Error.js
 ---*/
 
@@ -14,7 +13,7 @@ var __FACTORY = String.prototype.replace;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.replace; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.replace; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
     if (e instanceof Test262Error) throw e;
 }
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A8.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A8.js
index 804057ce1cc74e21cc0a15c8ddc2fd64e1b3b15d..3ad4ba9532784a9a476f0f618b3ab7c0cfdec6c1 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A8.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A8.js
@@ -7,13 +7,12 @@ es5id: 15.5.4.11_A8
 description: >
     Checking if enumerating the String.prototype.replace.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.replace.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.replace.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.replace.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.replace.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.replace.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/replace/S15.5.4.11_A9.js b/test/built-ins/String/prototype/replace/S15.5.4.11_A9.js
index c116d554aba4305dc91755e29a3be65514537d14..b397253c696bcde6fa303e876ee6ae2eca38f6bb 100644
--- a/test/built-ins/String/prototype/replace/S15.5.4.11_A9.js
+++ b/test/built-ins/String/prototype/replace/S15.5.4.11_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.11_A9
 description: >
     Checking if deleting the String.prototype.replace.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.replace.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.replace.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.replace.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.replace.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.replace.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.replace.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.replace.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.replace.length; String.prototype.replace.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.replace.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.replace.length; String.prototype.replace.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.replace.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/search/S15.5.4.12_A10.js b/test/built-ins/String/prototype/search/S15.5.4.12_A10.js
index de22f528cdfe29c90848ceb259a86a29caa4e8eb..9b118613279293572bb08ee7a07e37f045139735 100644
--- a/test/built-ins/String/prototype/search/S15.5.4.12_A10.js
+++ b/test/built-ins/String/prototype/search/S15.5.4.12_A10.js
@@ -7,13 +7,13 @@ es5id: 15.5.4.12_A10
 description: >
     Checking if varying the String.prototype.search.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.search.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.search.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.search.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.search.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.search.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/search/S15.5.4.12_A1_T11.js b/test/built-ins/String/prototype/search/S15.5.4.12_A1_T11.js
index 0918761bcd1aba186e524213b2e9082dc6c26784..8367e9ae3ffde0dd0942a6c1053f9c481cf2c6ca 100644
--- a/test/built-ins/String/prototype/search/S15.5.4.12_A1_T11.js
+++ b/test/built-ins/String/prototype/search/S15.5.4.12_A1_T11.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.12_A1_T11
 description: >
     Argument is object, and instance is string.  Object with overrided
     toString function, that throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "intostr";}}
@@ -17,7 +16,7 @@ var __str = "ABB\u0041BABAB";
 //CHECK#1
     try {
       var x = __str.search(__obj);
-      $FAIL('#1: var x = __str.search(__obj) lead to throwing exception');
+      $ERROR('#1: var x = __str.search(__obj) lead to throwing exception');
     } catch (e) {
       if (e!=="intostr") {
         $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/search/S15.5.4.12_A1_T12.js b/test/built-ins/String/prototype/search/S15.5.4.12_A1_T12.js
index 80a86606ad0b58985d0d570094c80bfc183ce068..b53f6445200f59423687dacc7ea0876b20ca312a 100644
--- a/test/built-ins/String/prototype/search/S15.5.4.12_A1_T12.js
+++ b/test/built-ins/String/prototype/search/S15.5.4.12_A1_T12.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.12_A1_T12
 description: >
     Argument is object, and instance is string.  Object with overrided
     toString and valueOf functions, valueOf throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}}
@@ -17,7 +16,7 @@ var __str = new String("ABB\u0041BABAB");
 //CHECK#1
     try {
       var x = __str.search(__obj);
-      $FAIL('#1: var x = __str.search(__obj) lead to throwing exception');
+      $ERROR('#1: var x = __str.search(__obj) lead to throwing exception');
     } catch (e) {
       if (e!=="intostr") {
         $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/search/S15.5.4.12_A7.js b/test/built-ins/String/prototype/search/S15.5.4.12_A7.js
index 9a7faef3767d65fae6be9858b9fe272ca64f5573..08e2f8ef63a0fbd311ca6584a7730caff5d972b8 100644
--- a/test/built-ins/String/prototype/search/S15.5.4.12_A7.js
+++ b/test/built-ins/String/prototype/search/S15.5.4.12_A7.js
@@ -7,14 +7,13 @@ es5id: 15.5.4.12_A7
 description: Checking if creating the String.prototype.search object fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var __FACTORY = String.prototype.search;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.search; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.search; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.1: __FACTORY = String.prototype.search; "__instance = new __FACTORY" throw a TypeError. Actual: ' + (e));  
diff --git a/test/built-ins/String/prototype/search/S15.5.4.12_A8.js b/test/built-ins/String/prototype/search/S15.5.4.12_A8.js
index 073d33863fe6e78c6f2a7de3f940cccfa49390ed..e51d88ad62cf3a6d27abce527c8e1ac5d2234659 100644
--- a/test/built-ins/String/prototype/search/S15.5.4.12_A8.js
+++ b/test/built-ins/String/prototype/search/S15.5.4.12_A8.js
@@ -7,13 +7,12 @@ es5id: 15.5.4.12_A8
 description: >
     Checking if enumerating the String.prototype.search.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.search.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.search.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.search.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.search.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.search.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/search/S15.5.4.12_A9.js b/test/built-ins/String/prototype/search/S15.5.4.12_A9.js
index 90bb0c1fd5d3faab04ed8f7ef575c956d2699d65..a2a170480d9304e509dc20c25c403555defa501e 100644
--- a/test/built-ins/String/prototype/search/S15.5.4.12_A9.js
+++ b/test/built-ins/String/prototype/search/S15.5.4.12_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.12_A9
 description: >
     Checking if deleting the String.prototype.search.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.search.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.search.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.search.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.search.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.search.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.search.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.search.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.search.length; String.prototype.search.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.search.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.search.length; String.prototype.search.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.search.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/slice/S15.5.4.13_A10.js b/test/built-ins/String/prototype/slice/S15.5.4.13_A10.js
index 0c1cf4ac32a4b645ac5dd9af5a001cb0c5f4cb04..1905752598ca449e07f286ce96119112af7a3775 100644
--- a/test/built-ins/String/prototype/slice/S15.5.4.13_A10.js
+++ b/test/built-ins/String/prototype/slice/S15.5.4.13_A10.js
@@ -7,13 +7,13 @@ es5id: 15.5.4.13_A10
 description: >
     Checking if varying the String.prototype.slice.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.slice.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.slice.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.slice.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.slice.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.slice.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T11.js b/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T11.js
index bc472297e0b316bf052c08d6e8daabad57530207..1e5d7e9a7a313ece95b7b85f0f09f1797e78e1c4 100644
--- a/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T11.js
+++ b/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T11.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.13_A1_T11
 description: >
     Arguments are objects, and instance is string, objects have
     overrided valueOf function, that return exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {valueOf:function(){throw "instart";}};
@@ -18,7 +17,7 @@ var __str = "ABB\u0041BABAB";
 //CHECK#1
         try {
           var x = __str.slice(__obj,__obj2);
-          $FAIL('#1: "var x = __str.slice(__obj,__obj2)" lead to throwing exception');
+          $ERROR('#1: "var x = __str.slice(__obj,__obj2)" lead to throwing exception');
         } catch (e) {
           if (e!=="instart") {
             $ERROR('#1.1: Exception === "instart". Actual: '+e);
diff --git a/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T12.js b/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T12.js
index 1ce363b2d91cfefd9cc642213b7a89d933924704..351daa7f7fba5d71771e71ea4960a68eb8c13b4d 100644
--- a/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T12.js
+++ b/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T12.js
@@ -9,7 +9,6 @@ description: >
     overrided valueOf function and toString function, that return
     exception.  Second object have overrided valueOf function, that
     return exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {valueOf:function(){return {};}, toString:function(){throw "instart";}};
@@ -20,7 +19,7 @@ var __str = new String("ABB\u0041BABAB");
 //CHECK#1
     try {
       var x = __str.slice(__obj, __obj2);
-      $FAIL('#1: "var x = __str.slice(__obj,__obj2)" lead to throwing exception');
+      $ERROR('#1: "var x = __str.slice(__obj,__obj2)" lead to throwing exception');
     } catch (e) {
       if (e!=="instart") {
         $ERROR('#1.1: Exception === "instart". Actual: '+e);
diff --git a/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T13.js b/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T13.js
index 1a53b741c9a0e2e8d2f43995d965eec31872ee17..82799f1ab84d89ea8f82441bdb45028191da9d9f 100644
--- a/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T13.js
+++ b/test/built-ins/String/prototype/slice/S15.5.4.13_A1_T13.js
@@ -8,7 +8,6 @@ description: >
     Arguments are objects, and instance is string.  First object have
     overrided valueOf and toString functions.  Second object have
     overrided toString function, that return exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {valueOf:function(){return {};}, toString:function(){return 1;}};
@@ -18,7 +17,7 @@ var __obj2 = {toString:function(){throw "inend";}};
 //CHECK#1
 try {
     var x = "ABB\u0041BABAB\u0031BBAA".slice(__obj, __obj2);
-    $FAIL('#1: "var x = slice(__obj,__obj2)" lead to throwing exception');
+    $ERROR('#1: "var x = slice(__obj,__obj2)" lead to throwing exception');
 } catch (e) {
     if (e!=="inend") {
         $ERROR('#1.1: Exception === "inend". Actual: '+e);
diff --git a/test/built-ins/String/prototype/slice/S15.5.4.13_A7.js b/test/built-ins/String/prototype/slice/S15.5.4.13_A7.js
index 4f9c59679b6cd718f12fe42cb4de4bb124982a28..7246b6d8f07cc79741252cae3e1ef50f8726d4d0 100644
--- a/test/built-ins/String/prototype/slice/S15.5.4.13_A7.js
+++ b/test/built-ins/String/prototype/slice/S15.5.4.13_A7.js
@@ -7,14 +7,13 @@ es5id: 15.5.4.13_A7
 description: Checking if creating the String.prototype.slice object fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var __FACTORY = String.prototype.slice;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.slice; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.slice; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
   $PRINT(e);
 }
diff --git a/test/built-ins/String/prototype/slice/S15.5.4.13_A8.js b/test/built-ins/String/prototype/slice/S15.5.4.13_A8.js
index b6e6e1e60e30c18fe74c60765b27f2bd68e07c3d..9e4042b08c3e0d9b038013efee2dff54050271c9 100644
--- a/test/built-ins/String/prototype/slice/S15.5.4.13_A8.js
+++ b/test/built-ins/String/prototype/slice/S15.5.4.13_A8.js
@@ -7,13 +7,12 @@ es5id: 15.5.4.13_A8
 description: >
     Checking if enumerating the String.prototype.slice.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.slice.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.slice.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.slice.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.slice.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.slice.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/slice/S15.5.4.13_A9.js b/test/built-ins/String/prototype/slice/S15.5.4.13_A9.js
index 5d12784db27325a17585754d2a7f6420f2241f5f..5cd957366ab7eb27d8169d3f4df148cc7d26166e 100644
--- a/test/built-ins/String/prototype/slice/S15.5.4.13_A9.js
+++ b/test/built-ins/String/prototype/slice/S15.5.4.13_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.13_A9
 description: >
     Checking if deleting the String.prototype.slice.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.slice.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.slice.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.slice.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.slice.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.slice.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.slice.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.slice.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.slice.length; String.prototype.slice.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.slice.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.slice.length; String.prototype.slice.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.slice.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/split/S15.5.4.14_A10.js b/test/built-ins/String/prototype/split/S15.5.4.14_A10.js
index ed6951d6c9c0ca937756e453be8df113bcb6cfb8..f4f331cb6e19e6bb1f17f634f7c9488a5ce6336d 100644
--- a/test/built-ins/String/prototype/split/S15.5.4.14_A10.js
+++ b/test/built-ins/String/prototype/split/S15.5.4.14_A10.js
@@ -7,13 +7,13 @@ es5id: 15.5.4.14_A10
 description: >
     Checking if varying the String.prototype.split.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.split.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.split.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.split.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.split.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.split.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T11.js b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T11.js
index bc03182d6369c1152e469e797b4edc0dac613d04..6c1e4d2232441206085dd3951182cab2e9fead4a 100644
--- a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T11.js
+++ b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T11.js
@@ -13,7 +13,6 @@ description: >
     Arguments are objects, and instance is string.  First object have
     overrided toString function.  Second object have overrided valueOf
     function, that throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
@@ -24,7 +23,7 @@ var __str = "ABB\u0041BABAB";
 //CHECK#1
         try {
           var x = __str.split(__obj, __obj2);
-          $FAIL('#1: "var x = __str.split(__obj, __obj2)" lead to throwing exception');
+          $ERROR('#1: "var x = __str.split(__obj, __obj2)" lead to throwing exception');
         } catch (e) {
           if (e!=="intointeger") {
             $ERROR('#1.1: Exception === "intointeger". Actual: '+e);
diff --git a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T12.js b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T12.js
index f0fd1cb9c767c15d0875ccedbaa1b97eca8c52b2..bf20ec28a86709c6750d2d5cf1d68c7d0e0309e2 100644
--- a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T12.js
+++ b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T12.js
@@ -13,7 +13,6 @@ description: >
     Arguments are objects, and instance is string.  First object have
     overrided toString function.  Second object have overrided valueOf
     function and toString function, that throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
@@ -24,7 +23,7 @@ var __str = new String("ABB\u0041BABAB");
 //CHECK#1
     try {
       var x = __str.split(__obj, __obj2);
-      $FAIL('#1: "var x = __str.split(__obj, __obj2)" lead to throwing exception');
+      $ERROR('#1: "var x = __str.split(__obj, __obj2)" lead to throwing exception');
     } catch (e) {
       if (e!=="intointeger") {
         $ERROR('#1.1: Exception === "intointeger". Actual: '+e);
diff --git a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T14.js b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T14.js
index c6c7d7bf36541abb5fd8472b784884cada612699..3b35520e88d30b0691283cb8613d082c620fe4eb 100644
--- a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T14.js
+++ b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T14.js
@@ -13,7 +13,6 @@ description: >
     Arguments are objects, and instance is string.  First object have
     overrided toString function, that throw exception.  Second object
     have overrided valueOf function, that throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "intostr";}};
@@ -25,7 +24,7 @@ Number.prototype.split=String.prototype.split;
 //CHECK#1
     try {
       var x = __instance.split(__obj, __obj2);
-      $FAIL('#1: "var x = __instance.split(__obj, __obj2)" lead to throwing exception');
+      $ERROR('#1: "var x = __instance.split(__obj, __obj2)" lead to throwing exception');
     } catch (e) {
       if (e!=="intoint") {
         $ERROR('#1.1: Exception === "intoint". Actual: '+e);
diff --git a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T15.js b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T15.js
index 3ea3ae8dfc157609b9ea617bec46cb62604e24ca..3f2850888e85eeb44462b2999f8b4259b4ba7b2f 100644
--- a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T15.js
+++ b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T15.js
@@ -14,7 +14,6 @@ description: >
     overrided toString function and valueOf function, that throw
     exception.  Second object have overrided valueOf function, that
     throw exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}};
@@ -29,7 +28,7 @@ var __instance = new __FACTORY(void 0);
 //CHECK#1
 try {
   var x = __instance.split(__obj, __obj2);
-  $FAIL('#1: "var x = __instance.split(__obj, __obj2)" lead to throwing exception');
+  $ERROR('#1: "var x = __instance.split(__obj, __obj2)" lead to throwing exception');
 } catch (e) {
   if (e!=="intointeger") {
     $ERROR('#1.1: Exception === "intointeger". Actual: '+e);
diff --git a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T16.js b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T16.js
index db5328008e4515385de49506f7eb2feda3a7634a..40f02daf6602b9d6c02811f0978034aaf696990f 100644
--- a/test/built-ins/String/prototype/split/S15.5.4.14_A1_T16.js
+++ b/test/built-ins/String/prototype/split/S15.5.4.14_A1_T16.js
@@ -12,7 +12,6 @@ es5id: 15.5.4.14_A1_T16
 description: >
     Argument is object, and instance is Number.  Object have overrided
     toString function, that return regexp
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return /\u0037\u0037/g;}};
@@ -21,7 +20,7 @@ Number.prototype.split=String.prototype.split;
 
 try {
   var __split = 6776767677.006771122677555.split(__obj);
-  $FAIL('#1: "__split = 6776767677.006771122677555.split(__obj)" lead to throwing exception');
+  $ERROR('#1: "__split = 6776767677.006771122677555.split(__obj)" lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: Exception is instance of TypeError. Actual: '+e);
diff --git a/test/built-ins/String/prototype/split/S15.5.4.14_A7.js b/test/built-ins/String/prototype/split/S15.5.4.14_A7.js
index 791a2c0967b7adcc139d2a0a83628e6200961dcc..690eaac8a4be2f3231287166ea054e32dd025ed0 100644
--- a/test/built-ins/String/prototype/split/S15.5.4.14_A7.js
+++ b/test/built-ins/String/prototype/split/S15.5.4.14_A7.js
@@ -6,7 +6,6 @@ info: String.prototype.split can't be used as constructor
 es5id: 15.5.4.14_A7
 description: Checking if creating the String.prototype.split object fails
 includes:
-    - $FAIL.js
     - Test262Error.js
 ---*/
 
@@ -14,7 +13,7 @@ var __FACTORY = String.prototype.split;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.split; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.split; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
     if (e instanceof Test262Error) throw e;
 }
diff --git a/test/built-ins/String/prototype/split/S15.5.4.14_A8.js b/test/built-ins/String/prototype/split/S15.5.4.14_A8.js
index 74328a411012f7d4e1fa3291a5f01fe3f5a0ee9d..640f04120e2be9bf180609d64c9791ddc42866a6 100644
--- a/test/built-ins/String/prototype/split/S15.5.4.14_A8.js
+++ b/test/built-ins/String/prototype/split/S15.5.4.14_A8.js
@@ -7,13 +7,12 @@ es5id: 15.5.4.14_A8
 description: >
     Checking if enumerating the String.prototype.split.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.split.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.split.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.split.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.split.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.split.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/split/S15.5.4.14_A9.js b/test/built-ins/String/prototype/split/S15.5.4.14_A9.js
index 532cd97f19194281531156432e2d263dd79c7528..ca061076f9b0eba3e8ac58a64deb80723eaa4253 100644
--- a/test/built-ins/String/prototype/split/S15.5.4.14_A9.js
+++ b/test/built-ins/String/prototype/split/S15.5.4.14_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.14_A9
 description: >
     Checking if deleting the String.prototype.split.length property
     fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.split.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.split.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.split.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.split.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.split.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.split.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.split.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.split.length; String.prototype.split.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.split.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.split.length; String.prototype.split.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.split.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/substring/S15.5.4.15_A10.js b/test/built-ins/String/prototype/substring/S15.5.4.15_A10.js
index 2cc1836ffe6f48a5fe21f4e9cce447d477a374d0..792a205e7f55765399fb35cf3c7fc4fed569f73a 100644
--- a/test/built-ins/String/prototype/substring/S15.5.4.15_A10.js
+++ b/test/built-ins/String/prototype/substring/S15.5.4.15_A10.js
@@ -7,13 +7,13 @@ es5id: 15.5.4.15_A10
 description: >
     Checking if varying the String.prototype.substring.length property
     fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.substring.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.substring.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.substring.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.substring.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.substring.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T11.js b/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T11.js
index cd471e3908888db5f63ee39692249f21b45318db..f17b396d99ab5d1ea5fcd612034b8bb43972dd4c 100644
--- a/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T11.js
+++ b/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T11.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.15_A1_T11
 description: >
     Arguments are objects, and instance is string, objects have
     overrided valueOf function, that return exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {valueOf:function(){throw "instart";}};
@@ -18,7 +17,7 @@ var __str = "ABB\u0041BABAB";
 //CHECK#1
         try {
           var x = __str.substring(__obj,__obj2);
-          $FAIL('#1: "var x = __str.substring(__obj,__obj2)" lead to throw exception');
+          $ERROR('#1: "var x = __str.substring(__obj,__obj2)" lead to throw exception');
         } catch (e) {
           if (e!=="instart") {
             $ERROR('#1.1: Exception === "instart". Actual: '+e);
diff --git a/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T12.js b/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T12.js
index b9cdb36ca4099f98948fb554d50e9e8ab47f5784..b8f9af963da7f35b49043f7ec2fb973a0cd1643f 100644
--- a/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T12.js
+++ b/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T12.js
@@ -9,7 +9,6 @@ description: >
     overrided valueOf function and toString function, that return
     exception.  Second object have overrided valueOf function, that
     return exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {valueOf:function(){return {};}, toString:function(){throw "instart";}};
@@ -20,7 +19,7 @@ var __str = new String("ABB\u0041BABAB");
 //CHECK#1
     try {
       var x = __str.substring(__obj, __obj2);
-      $FAIL('#1: "var x = __str.substring(__obj,__obj2)" lead to throw exception');
+      $ERROR('#1: "var x = __str.substring(__obj,__obj2)" lead to throw exception');
     } catch (e) {
       if (e!=="instart") {
         $ERROR('#1.1: Exception ==="instart". Actual: '+e);
diff --git a/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T13.js b/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T13.js
index 656b85f5e1a1cd93c7cead77892cfac4dfbcbd8d..f749700946a3b9cfa1d361ae90533a429c4824a8 100644
--- a/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T13.js
+++ b/test/built-ins/String/prototype/substring/S15.5.4.15_A1_T13.js
@@ -8,7 +8,6 @@ description: >
     Arguments are objects, and instance is string.  First object have
     overrided valueOf and toString functions.  Second object have
     overrided toString function, that return exception
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {valueOf:function(){return {};}, toString:function(){return 1;}};
@@ -18,7 +17,7 @@ var __obj2 = {toString:function(){throw "inend";}};
 //CHECK#1
 try {
     var x = "ABB\u0041BABAB\u0031BBAA".substring(__obj, __obj2);
-    $FAIL('#1: var x = "ABB\\u0041BABAB\\u0031BBAA".substring(__obj,__obj2) lead to throw exception');
+    $ERROR('#1: var x = "ABB\\u0041BABAB\\u0031BBAA".substring(__obj,__obj2) lead to throw exception');
 } catch (e) {
     if (e!=="inend") {
         $ERROR('#1.1: Exception === "inend". Actual: '+e);
diff --git a/test/built-ins/String/prototype/substring/S15.5.4.15_A7.js b/test/built-ins/String/prototype/substring/S15.5.4.15_A7.js
index 725f5fe45838a6a6428f1518ad4d851e81a70d56..e9a8f6bf247ebd1c1749712f016b3f10ed5b0071 100644
--- a/test/built-ins/String/prototype/substring/S15.5.4.15_A7.js
+++ b/test/built-ins/String/prototype/substring/S15.5.4.15_A7.js
@@ -7,14 +7,13 @@ es5id: 15.5.4.15_A7
 description: Checking if creating the String.prototype.substring object fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var __FACTORY = String.prototype.substring;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.substring; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.substring; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.2: undefined = 1 throw a TypeError. Actual: ' + (e));  
diff --git a/test/built-ins/String/prototype/substring/S15.5.4.15_A8.js b/test/built-ins/String/prototype/substring/S15.5.4.15_A8.js
index 9409caef42eaec4dfa0bb08f870e5d73c3cfa1ca..b48d4db02f47a7ccf9afe2fb90cc0e54b8bcf617 100644
--- a/test/built-ins/String/prototype/substring/S15.5.4.15_A8.js
+++ b/test/built-ins/String/prototype/substring/S15.5.4.15_A8.js
@@ -7,13 +7,12 @@ es5id: 15.5.4.15_A8
 description: >
     Checking if enumerating the String.prototype.substring.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.substring.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.substring.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.substring.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.substring.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.substring.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/substring/S15.5.4.15_A9.js b/test/built-ins/String/prototype/substring/S15.5.4.15_A9.js
index 9d710f1065e1a90cfc76143bd338aa60d4758863..a512fa1dfebd79604e0bfaa4a27a1e17ff1bfd0e 100644
--- a/test/built-ins/String/prototype/substring/S15.5.4.15_A9.js
+++ b/test/built-ins/String/prototype/substring/S15.5.4.15_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.15_A9
 description: >
     Checking if deleting the String.prototype.substring.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.substring.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.substring.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.substring.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.substring.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.substring.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.substring.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.substring.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.substring.length; String.prototype.substring.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.substring.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.substring.length; String.prototype.substring.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.substring.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A10.js b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A10.js
index 1da33690bd2c59fbf2bc6ca10489a76dd4523038..87b54adc1dd575a00a5d21ee6aa7dd6ca5237f03 100644
--- a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A10.js
+++ b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A10.js
@@ -9,13 +9,13 @@ es5id: 15.5.4.17_A10
 description: >
     Checking if varying the String.prototype.toLocaleLowerCase.length
     property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.toLocaleLowerCase.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.toLocaleLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleLowerCase.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.toLocaleLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleLowerCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A1_T11.js b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A1_T11.js
index 5512af2587553d4c1deb4eec986ee979356938f3..10c4df6a281d50bdfc83d19a3a7d2dc1ed7779f2 100644
--- a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A1_T11.js
+++ b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A1_T11.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.17_A1_T11
 description: >
     Override toString function, toString throw exception, then call
     toLocaleLowerCase() function for this object
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "intostr";}}
@@ -17,7 +16,7 @@ __obj.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
 //CHECK#1
 try {
   var x = __obj.toLocaleLowerCase();
-   	$FAIL('#1: "var x = __obj.toLocaleLowerCase()" lead to throwing exception');
+   	$ERROR('#1: "var x = __obj.toLocaleLowerCase()" lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A1_T12.js b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A1_T12.js
index 6e1693a919e7ecd78a68a79c5ca2e41d68315085..716a6d917832e77595a9205662cfb9628a0aab71 100644
--- a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A1_T12.js
+++ b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A1_T12.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.17_A1_T12
 description: >
     Override toString and valueOf functions, valueOf throw exception,
     then call toLocaleLowerCase() function for this object
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}}
@@ -17,7 +16,7 @@ __obj.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
 //CHECK#1
 try {
   var x = __obj.toLocaleLowerCase();
- 	$FAIL('#1: "var x = __obj.toLocaleLowerCase()" lead to throwing exception');
+ 	$ERROR('#1: "var x = __obj.toLocaleLowerCase()" lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A7.js b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A7.js
index 1092cb0b43507f02df80db6785ad9abb7ac5af36..e48f67321e29402003aaeb1efcaf9d16d87dee63 100644
--- a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A7.js
+++ b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A7.js
@@ -9,14 +9,13 @@ description: >
     fails
 includes:
     - $PRINT.js
-    - $FAIL.js
 ---*/
 
 var __FACTORY = String.prototype.toLocaleLowerCase;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: var __FACTORY = String.prototype.toLocaleLowerCase; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: var __FACTORY = String.prototype.toLocaleLowerCase; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.1: var __FACTORY = String.prototype.toLocaleLowerCase; "var __instance = new __FACTORY" throw a TypeError. Actual: ' + (e));  
diff --git a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A8.js b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A8.js
index 2db5d4b022e9128fc8ef974b28cc76249392c46d..94ab9c50fe3abf8e62a9d8f3a63ae92c86f71f03 100644
--- a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A8.js
+++ b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A8.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.17_A8
 description: >
     Checking if enumerating the
     String.prototype.toLocaleLowerCase.length property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.toLocaleLowerCase.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.toLocaleLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleLowerCase.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.toLocaleLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleLowerCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A9.js b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A9.js
index 5efe5d9d0316c2d7af29a50498a2319bc53f69ff..968054c6369e6efd7b66434711f1ac9587f52590 100644
--- a/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A9.js
+++ b/test/built-ins/String/prototype/toLocaleLowerCase/S15.5.4.17_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.17_A9
 description: >
     Checking if deleting the String.prototype.toLocaleLowerCase.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.toLocaleLowerCase.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.toLocaleLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleLowerCase.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.toLocaleLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleLowerCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.toLocaleLowerCase.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.toLocaleLowerCase.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.toLocaleLowerCase.length; String.prototype.toLocaleLowerCase.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.toLocaleLowerCase.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.toLocaleLowerCase.length; String.prototype.toLocaleLowerCase.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.toLocaleLowerCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A10.js b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A10.js
index 01ed626162562aeaca1836ee97eacead173f6afa..f067ca78f373ecb5672b0a7ec28afd74af009ca4 100644
--- a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A10.js
+++ b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A10.js
@@ -9,13 +9,13 @@ es5id: 15.5.4.19_A10
 description: >
     Checking if varying the String.prototype.toLocaleUpperCase.length
     property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.toLocaleUpperCase.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.toLocaleUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleUpperCase.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.toLocaleUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleUpperCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A1_T11.js b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A1_T11.js
index 86266e92d96b4fa185dba6dd5f5d46c226932a1d..45a9a2087704f40caf9300fcfa6b5499c24cd6ad 100644
--- a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A1_T11.js
+++ b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A1_T11.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.19_A1_T11
 description: >
     Override toString function, toString throw exception, then call
     toLocaleUpperCase() function for this object
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "intostr";}}
@@ -16,7 +15,7 @@ __obj.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
 //CHECK#1
 try {
   var x = __obj.toLocaleUpperCase();
-  $FAIL('#1: "var x = __obj.toLocaleUpperCase()" lead to throwing exception');
+  $ERROR('#1: "var x = __obj.toLocaleUpperCase()" lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A1_T12.js b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A1_T12.js
index 7936b152962c97b15df98d5c493f7fca3a1ed1a4..185ea8fcb687b5ac13d67aa469aac7629d040886 100644
--- a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A1_T12.js
+++ b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A1_T12.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.19_A1_T12
 description: >
     Override toString and valueOf functions, valueOf throw exception,
     then call toLocaleUpperCase() function for this object
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}}
@@ -16,7 +15,7 @@ __obj.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
 //CHECK#1
 try {
   var x = __obj.toLocaleUpperCase();
- 	$FAIL('#1: "var x = __obj.toLocaleUpperCase()" lead to throwing exception');
+ 	$ERROR('#1: "var x = __obj.toLocaleUpperCase()" lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A7.js b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A7.js
index 609cc09ea8eaa215b021cc8ddf1d3393fa28e3a7..3f57102eefed31e8240d1bf421f1de758b43d5e4 100644
--- a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A7.js
+++ b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A7.js
@@ -7,14 +7,13 @@ es5id: 15.5.4.19_A7
 description: >
     Checking if creating the String.prototype.toLocaleUpperCase object
     fails
-includes: [$FAIL.js]
 ---*/
 
 var __FACTORY = String.prototype.toLocaleUpperCase;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.toLocaleUpperCase; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: __FACTORY = String.prototype.toLocaleUpperCase; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.1:  var __instance = new __FACTORY;  Object has no construct lead  a TypeError. Actual: ' + (e));  
diff --git a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A8.js b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A8.js
index 0791e334cdca4283b487073ce8f0549594e99980..fd792979e49886307aa96f5b60da18b3fd57cca0 100644
--- a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A8.js
+++ b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A8.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.19_A8
 description: >
     Checking if enumerating the
     String.prototype.toLocaleUpperCase.length property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.toLocaleUpperCase.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.toLocaleUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleUpperCase.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.toLocaleUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleUpperCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A9.js b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A9.js
index b17b2d8a2b5a7f030cd2787dca941d4a9619684b..d970fc15b1b2af8d453772befc80ef1075747946 100644
--- a/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A9.js
+++ b/test/built-ins/String/prototype/toLocaleUpperCase/S15.5.4.19_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.19_A9
 description: >
     Checking if deleting the String.prototype.toLocaleUpperCase.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.toLocaleUpperCase.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.toLocaleUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleUpperCase.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.toLocaleUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLocaleUpperCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.toLocaleUpperCase.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.toLocaleUpperCase.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.toLocaleUpperCase.length; String.prototype.toLocaleUpperCase.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.toLocaleUpperCase.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.toLocaleUpperCase.length; String.prototype.toLocaleUpperCase.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.toLocaleUpperCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A10.js b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A10.js
index e396b4ab6270a8e4c0a0570ea3ac0cc6fedfb73a..fb6de350b200799d7a670f6ddeb661ddfc7391df 100644
--- a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A10.js
+++ b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A10.js
@@ -9,13 +9,13 @@ es5id: 15.5.4.16_A10
 description: >
     Checking if varying the String.prototype.toLowerCase.length
     property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.toLowerCase.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.toLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLowerCase.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.toLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLowerCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A1_T11.js b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A1_T11.js
index d167a5be4030dcc705524e1d4948f3f250864ffb..1e47da8621299fa37a0fc3c3812fbc14031a5b14 100644
--- a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A1_T11.js
+++ b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A1_T11.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.16_A1_T11
 description: >
     Override toString function, toString throw exception, then call
     toLowerCase() function for this object
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "intostr";}}
@@ -17,7 +16,7 @@ __obj.toLowerCase = String.prototype.toLowerCase;
 //CHECK#1
 try {
   var x = __obj.toLowerCase();
-   	$FAIL('#1: "var x = __obj.toLowerCase()" lead to throwing exception');
+   	$ERROR('#1: "var x = __obj.toLowerCase()" lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A1_T12.js b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A1_T12.js
index d38a9a0bbabd8b3d90d6a666f0ed3cb0f7b907ad..df60a250295ec3313d7ad6b760454590f576c1db 100644
--- a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A1_T12.js
+++ b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A1_T12.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.16_A1_T12
 description: >
     Override toString and valueOf functions, valueOf throw exception,
     then call toLowerCase() function for this object
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}}
@@ -17,7 +16,7 @@ __obj.toLowerCase = String.prototype.toLowerCase;
 //CHECK#1
 try {
   var x = __obj.toLowerCase();
- 	$FAIL('#1: "var x = __obj.toLowerCase()" lead to throwing exception');
+ 	$ERROR('#1: "var x = __obj.toLowerCase()" lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A7.js b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A7.js
index 87deaeff8f1a0fc1d1dafadd6f512ebb7bc6e049..4d8c14efe8186eee2f84bf6d50bd60d6a530086d 100644
--- a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A7.js
+++ b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A7.js
@@ -5,14 +5,13 @@
 info: String.prototype.toLowerCase can't be used as constructor
 es5id: 15.5.4.16_A7
 description: Checking if creating the String.prototype.toLowerCase object fails
-includes: [$FAIL.js]
 ---*/
 
 var __FACTORY = String.prototype.toLowerCase;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: var __FACTORY = String.prototype.toLowerCase; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: var __FACTORY = String.prototype.toLowerCase; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.1: var __FACTORY = String.prototype.toLowerCase; "__instance = new __FACTORY" throws a TypeError. Actual: ' + (e));  
diff --git a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A8.js b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A8.js
index 6b9ed0cdd841198b4afd85f932eae14bec93940d..9599077c7f0163b123e7186ee81b8b7e22eb2501 100644
--- a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A8.js
+++ b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A8.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.16_A8
 description: >
     Checking if enumerating the String.prototype.toLowerCase.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.toLowerCase.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.toLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLowerCase.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.toLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLowerCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A9.js b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A9.js
index ff157981b5f205de0cd959ef13e41165fb15754d..508e1ed5a311472ad4cb4ca5548518a6ef7cc490 100644
--- a/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A9.js
+++ b/test/built-ins/String/prototype/toLowerCase/S15.5.4.16_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.16_A9
 description: >
     Checking if deleting the String.prototype.toLowerCase.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.toLowerCase.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.toLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLowerCase.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.toLowerCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toLowerCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.toLowerCase.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.toLowerCase.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.toLowerCase.length; String.prototype.toLowerCase.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.toLowerCase.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.toLowerCase.length; String.prototype.toLowerCase.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.toLowerCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toString/S15.5.4.2_A2_T1.js b/test/built-ins/String/prototype/toString/S15.5.4.2_A2_T1.js
index 018af174bde3ee4f1eff4f174ac0cd668031080e..b18c5f6b56b5616c33edde1c30e8d266fd9cb6b9 100644
--- a/test/built-ins/String/prototype/toString/S15.5.4.2_A2_T1.js
+++ b/test/built-ins/String/prototype/toString/S15.5.4.2_A2_T1.js
@@ -8,7 +8,6 @@ info: >
     transferred to other kinds of objects for use as a method
 es5id: 15.5.4.2_A2_T1
 description: Checking if creating variable String.prototype.toString fails
-includes: [$FAIL.js]
 ---*/
 
 var __toString = String.prototype.toString;
@@ -26,7 +25,7 @@ if (typeof __toString !== "function") {
 //CHECK#2
 try {
   var x = __toString();
-  $FAIL('#2: "__toString = String.prototype.toString; var x = __toString();" lead to throwing exception');
+  $ERROR('#2: "__toString = String.prototype.toString; var x = __toString();" lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#2.1: "__toString = String.prototype.toString; var x = __toString();" lead to throwing exception. Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/String/prototype/toString/S15.5.4.2_A2_T2.js b/test/built-ins/String/prototype/toString/S15.5.4.2_A2_T2.js
index 3f71cc5dcd7d6e817ba00d3a351c8ffe3855d8fc..fb15212f0693dbc27108acd12073631de1208cf0 100644
--- a/test/built-ins/String/prototype/toString/S15.5.4.2_A2_T2.js
+++ b/test/built-ins/String/prototype/toString/S15.5.4.2_A2_T2.js
@@ -8,7 +8,6 @@ info: >
     transferred to other kinds of objects for use as a method
 es5id: 15.5.4.2_A2_T2
 description: Checking if creating the object String.prototype.toString fails
-includes: [$FAIL.js]
 ---*/
 
 var __obj={toString : String.prototype.toString};
@@ -26,7 +25,7 @@ if (typeof __obj["toString"] !== "function") {
 //CHECK#2
 try {
   var x = (__obj == 1);
-  $FAIL('#2: "var x = (__obj == 1)" lead to throwing exception');
+  $ERROR('#2: "var x = (__obj == 1)" lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#2.1: Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A10.js b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A10.js
index c8f354dd39668e21fb3c7ea133bf6c816647cb2b..f61c6a3a0be91aa043015e944e24304effe702a9 100644
--- a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A10.js
+++ b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A10.js
@@ -9,13 +9,13 @@ es5id: 15.5.4.18_A10
 description: >
     Checking if varying the String.prototype.toUpperCase.length
     property fails
-includes: [$FAIL.js, propertyHelper.js]
+includes: [propertyHelper.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if (!(String.prototype.toUpperCase.hasOwnProperty('length'))) {
-  $FAIL('#1: String.prototype.toUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toUpperCase.hasOwnProperty('length'));
+  $ERROR('#1: String.prototype.toUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toUpperCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A1_T11.js b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A1_T11.js
index 5a8a2dd022689a6a165253eb2dcbbe63515096b6..63a68975ae135d327075ab1dc9b74c7aa877a68b 100644
--- a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A1_T11.js
+++ b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A1_T11.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.18_A1_T11
 description: >
     Override toString function, toString throw exception, then call
     toUpperCase() function for this object
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){throw "intostr";}}
@@ -16,7 +15,7 @@ __obj.toUpperCase = String.prototype.toUpperCase;
 //CHECK#1
 try {
   var x = __obj.toUpperCase();
-   	$FAIL('#1: "var x = __obj.toUpperCase()" lead to throwing exception');
+   	$ERROR('#1: "var x = __obj.toUpperCase()" lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A1_T12.js b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A1_T12.js
index d67c6adafb594fb736c4b8ae3b3e78fb4aec451a..7ec6f11d7d710c8140e71a759411a1ac797d1eba 100644
--- a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A1_T12.js
+++ b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A1_T12.js
@@ -7,7 +7,6 @@ es5id: 15.5.4.18_A1_T12
 description: >
     Override toString and valueOf functions, valueOf throw exception,
     then call toUpperCase() function for this object
-includes: [$FAIL.js]
 ---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}}
@@ -16,7 +15,7 @@ __obj.toUpperCase = String.prototype.toUpperCase;
 //CHECK#1
 try {
   var x = __obj.toUpperCase();
- 	$FAIL('#1: "var x = __obj.toUpperCase()" lead to throwing exception');
+ 	$ERROR('#1: "var x = __obj.toUpperCase()" lead to throwing exception');
 } catch (e) {
   if (e!=="intostr") {
     $ERROR('#1.1: Exception === "intostr". Actual: '+e);
diff --git a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A7.js b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A7.js
index fc9aae08183432bda1c2aff3037d752acf391c1b..bd2d26e8ae1e432f5d86310a7a28261e07e8e75a 100644
--- a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A7.js
+++ b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A7.js
@@ -5,14 +5,13 @@
 info: String.prototype.toUpperCase can't be used as constructor
 es5id: 15.5.4.18_A7
 description: Checking if creating the String.prototype.toUpperCase object fails
-includes: [$FAIL.js]
 ---*/
 
 var __FACTORY = String.prototype.toUpperCase;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: var __FACTORY = String.prototype.toUpperCase; "__instance = new __FACTORY" lead to throwing exception');
+  $ERROR('#1: var __FACTORY = String.prototype.toUpperCase; "__instance = new __FACTORY" lead to throwing exception');
 } catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.1: var __FACTORY = String.prototype.toUpperCase; "__instance = new __FACTORY" throw a TypeError. Actual: ' + (e));  
diff --git a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A8.js b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A8.js
index 1705ca58477434a0590615e0272ff15e0c871aaf..5df24d85594347aca9ff5d5c97613e715a61ce34 100644
--- a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A8.js
+++ b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A8.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.18_A8
 description: >
     Checking if enumerating the String.prototype.toUpperCase.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.toUpperCase.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.toUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toUpperCase.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.toUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toUpperCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A9.js b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A9.js
index 2409b5417cd8e92a212fb4258446564637c5104f..8ca650ee3bb3102f949c40648167b039186d1369 100644
--- a/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A9.js
+++ b/test/built-ins/String/prototype/toUpperCase/S15.5.4.18_A9.js
@@ -9,13 +9,12 @@ es5id: 15.5.4.18_A9
 description: >
     Checking if deleting the String.prototype.toUpperCase.length
     property fails
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
 if (!(String.prototype.toUpperCase.hasOwnProperty('length'))) {
-  $FAIL('#0: String.prototype.toUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toUpperCase.hasOwnProperty('length'));
+  $ERROR('#0: String.prototype.toUpperCase.hasOwnProperty(\'length\') return true. Actual: '+String.prototype.toUpperCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -31,7 +30,7 @@ if (!delete String.prototype.toUpperCase.length) {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if (String.prototype.toUpperCase.hasOwnProperty('length')) {
-  $FAIL('#2: delete String.prototype.toUpperCase.length; String.prototype.toUpperCase.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.toUpperCase.hasOwnProperty('length'));
+  $ERROR('#2: delete String.prototype.toUpperCase.length; String.prototype.toUpperCase.hasOwnProperty(\'length\') return false. Actual: '+String.prototype.toUpperCase.hasOwnProperty('length'));
 }
 //
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/built-ins/String/prototype/valueOf/S15.5.4.3_A2_T1.js b/test/built-ins/String/prototype/valueOf/S15.5.4.3_A2_T1.js
index 1b13ea604090f6a3f26fb3b1de474fb3de496dd3..d4275d4e222806cd2ada98a03fd8c22d38acfe55 100644
--- a/test/built-ins/String/prototype/valueOf/S15.5.4.3_A2_T1.js
+++ b/test/built-ins/String/prototype/valueOf/S15.5.4.3_A2_T1.js
@@ -7,7 +7,6 @@ info: >
     Therefore, it cannot be transferred to other kinds of objects for use as a method
 es5id: 15.5.4.3_A2_T1
 description: Checking if creating variable String.prototype.valueOf fails
-includes: [$FAIL.js]
 ---*/
 
 var __valueOf = String.prototype.valueOf;
@@ -25,7 +24,7 @@ if (typeof __valueOf !== "function") {
 //CHECK#2
 try {
   var x = __valueOf();
-  $FAIL('#2: "__valueOf = String.prototype.valueOf; var x = __valueOf()" lead to throwing exception');
+  $ERROR('#2: "__valueOf = String.prototype.valueOf; var x = __valueOf()" lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#2.1: Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/String/prototype/valueOf/S15.5.4.3_A2_T2.js b/test/built-ins/String/prototype/valueOf/S15.5.4.3_A2_T2.js
index 24f3e47db0fbb8fe458fcd801d4bc55fdf88159c..9dfd9e7e8994c91c10193c2296c11d63e8a794f5 100644
--- a/test/built-ins/String/prototype/valueOf/S15.5.4.3_A2_T2.js
+++ b/test/built-ins/String/prototype/valueOf/S15.5.4.3_A2_T2.js
@@ -7,7 +7,6 @@ info: >
     Therefore, it cannot be transferred to other kinds of objects for use as a method
 es5id: 15.5.4.3_A2_T2
 description: Checking if creating the object String.prototype.valueOf fails
-includes: [$FAIL.js]
 ---*/
 
 var __obj={valueOf : String.prototype.valueOf};
@@ -25,7 +24,7 @@ if (typeof __obj["valueOf"] !== "function") {
 //CHECK#2
 try {
   var x = (__obj == 1);
-  $FAIL('#2: "var __obj={valueOf : String.prototype.valueOf}; var x = (__obj == 1)" lead to throwing exception');
+  $ERROR('#2: "var __obj={valueOf : String.prototype.valueOf}; var x = (__obj == 1)" lead to throwing exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#2.1: Exception is instance of TypeError. Actual: exception is '+e);
diff --git a/test/built-ins/decodeURI/S15.1.3.1_A5.2.js b/test/built-ins/decodeURI/S15.1.3.1_A5.2.js
index fefb4b5439f711bd0521ee7531c8fa5e6038e81a..e04c71cd105fdd2e1cfbaeef130dc1d2615574e0 100644
--- a/test/built-ins/decodeURI/S15.1.3.1_A5.2.js
+++ b/test/built-ins/decodeURI/S15.1.3.1_A5.2.js
@@ -5,12 +5,11 @@
 info: The length property of decodeURI does not have the attribute DontDelete
 es5id: 15.1.3.1_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (decodeURI.hasOwnProperty('length') !== true) {
-  $FAIL('#1: decodeURI.hasOwnProperty(\'length\') === true. Actual: ' + (decodeURI.hasOwnProperty('length')));
+  $ERROR('#1: decodeURI.hasOwnProperty(\'length\') === true. Actual: ' + (decodeURI.hasOwnProperty('length')));
 }
 
 delete decodeURI.length;
diff --git a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.2.js b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.2.js
index 3f4673858e0524360c585a25427a764578a059c3..ef720eb205e9eb56de7d9a0d3822ca0e9496c04e 100644
--- a/test/built-ins/decodeURIComponent/S15.1.3.2_A5.2.js
+++ b/test/built-ins/decodeURIComponent/S15.1.3.2_A5.2.js
@@ -7,12 +7,11 @@ info: >
     DontDelete
 es5id: 15.1.3.2_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (decodeURIComponent.hasOwnProperty('length') !== true) {
-  $FAIL('#1: decodeURIComponent.hasOwnProperty(\'length\') === true. Actual: ' + (decodeURIComponent.hasOwnProperty('length')));
+  $ERROR('#1: decodeURIComponent.hasOwnProperty(\'length\') === true. Actual: ' + (decodeURIComponent.hasOwnProperty('length')));
 }
 
 delete decodeURIComponent.length;
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.2.js b/test/built-ins/encodeURI/S15.1.3.3_A5.2.js
index f9302dcc87b6944fdc69420ef3bc4bcecbbc540f..78b74e7ea8f857767e2b13def018d4f1f3ec0ac5 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.2.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.2.js
@@ -5,12 +5,11 @@
 info: The length property of encodeURI does not have the attribute DontDelete
 es5id: 15.1.3.3_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (encodeURI.hasOwnProperty('length') !== true) {
-  $FAIL('#1: encodeURI.hasOwnProperty(\'length\') === true. Actual: ' + (encodeURI.hasOwnProperty('length')));
+  $ERROR('#1: encodeURI.hasOwnProperty(\'length\') === true. Actual: ' + (encodeURI.hasOwnProperty('length')));
 }
 
 delete encodeURI.length;
diff --git a/test/built-ins/encodeURIComponent/S15.1.3.4_A5.2.js b/test/built-ins/encodeURIComponent/S15.1.3.4_A5.2.js
index 086e65ac99c952ef4afce167a706f451dfc37536..a4ce62f5175521fd240b38e221a2cc7ba0bbe6c5 100644
--- a/test/built-ins/encodeURIComponent/S15.1.3.4_A5.2.js
+++ b/test/built-ins/encodeURIComponent/S15.1.3.4_A5.2.js
@@ -7,12 +7,11 @@ info: >
     DontDelete
 es5id: 15.1.3.4_A5.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (encodeURIComponent.hasOwnProperty('length') !== true) {
-  $FAIL('#1: encodeURIComponent.hasOwnProperty(\'length\') === true. Actual: ' + (encodeURIComponent.hasOwnProperty('length')));
+  $ERROR('#1: encodeURIComponent.hasOwnProperty(\'length\') === true. Actual: ' + (encodeURIComponent.hasOwnProperty('length')));
 }
 
 delete encodeURIComponent.length;
diff --git a/test/built-ins/eval/S15.1.2.1_A4.2.js b/test/built-ins/eval/S15.1.2.1_A4.2.js
index 7e120fc6b600a63022db1831bae093daefe8ae87..eea3d65d1f1ea248819970e5a035716367d4b69d 100644
--- a/test/built-ins/eval/S15.1.2.1_A4.2.js
+++ b/test/built-ins/eval/S15.1.2.1_A4.2.js
@@ -5,12 +5,11 @@
 info: The length property of eval does not have the attribute DontDelete
 es5id: 15.1.2.1_A4.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (eval.hasOwnProperty('length') !== true) {
-  $FAIL('#1: eval.hasOwnProperty(\'length\') === true. Actual: ' + (eval.hasOwnProperty('length')));
+  $ERROR('#1: eval.hasOwnProperty(\'length\') === true. Actual: ' + (eval.hasOwnProperty('length')));
 }
 
 delete eval.length;
diff --git a/test/built-ins/isFinite/S15.1.2.5_A2.2.js b/test/built-ins/isFinite/S15.1.2.5_A2.2.js
index aa36e80d3af74893cb9b0284d6d21bf673df9708..b1336218973e34b41d08009aa13b5acff62755e8 100644
--- a/test/built-ins/isFinite/S15.1.2.5_A2.2.js
+++ b/test/built-ins/isFinite/S15.1.2.5_A2.2.js
@@ -5,12 +5,11 @@
 info: The length property of isFinite does not have the attribute DontDelete
 es5id: 15.1.2.5_A2.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (isFinite.hasOwnProperty('length') !== true) {
-  $FAIL('#1: isFinite.hasOwnProperty(\'length\') === true. Actual: ' + (isFinite.hasOwnProperty('length')));
+  $ERROR('#1: isFinite.hasOwnProperty(\'length\') === true. Actual: ' + (isFinite.hasOwnProperty('length')));
 }
 
 delete isFinite.length;
diff --git a/test/built-ins/isNaN/S15.1.2.4_A2.2.js b/test/built-ins/isNaN/S15.1.2.4_A2.2.js
index 6d1e9663c69c8992ef04b7f245ae259223b7344d..0ce5cf3be554e13043f8619bcce87deabd7249c0 100644
--- a/test/built-ins/isNaN/S15.1.2.4_A2.2.js
+++ b/test/built-ins/isNaN/S15.1.2.4_A2.2.js
@@ -5,12 +5,11 @@
 info: The length property of isNaN does not have the attribute DontDelete
 es5id: 15.1.2.4_A2.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (isNaN.hasOwnProperty('length') !== true) {
-  $FAIL('#1: isNaN.hasOwnProperty(\'length\') === true. Actual: ' + (isNaN.hasOwnProperty('length')));
+  $ERROR('#1: isNaN.hasOwnProperty(\'length\') === true. Actual: ' + (isNaN.hasOwnProperty('length')));
 }
 
 delete isNaN.length;
diff --git a/test/built-ins/parseFloat/S15.1.2.3_A7.2.js b/test/built-ins/parseFloat/S15.1.2.3_A7.2.js
index 08ad6282a287e94d3d18c444ff85ba9acd4898ec..18f2218f762525e26b2da71ff5b7cd0ef2d16093 100644
--- a/test/built-ins/parseFloat/S15.1.2.3_A7.2.js
+++ b/test/built-ins/parseFloat/S15.1.2.3_A7.2.js
@@ -5,12 +5,11 @@
 info: The length property of parseFloat does not have the attribute DontDelete
 es5id: 15.1.2.3_A7.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (parseFloat.hasOwnProperty('length') !== true) {
-  $FAIL('#1: parseFloat.hasOwnProperty(\'length\') === true. Actual: ' + (parseFloat.hasOwnProperty('length')));
+  $ERROR('#1: parseFloat.hasOwnProperty(\'length\') === true. Actual: ' + (parseFloat.hasOwnProperty('length')));
 }
 
 delete parseFloat.length;
diff --git a/test/built-ins/parseInt/S15.1.2.2_A9.2.js b/test/built-ins/parseInt/S15.1.2.2_A9.2.js
index ee9e30390c06ec0993b66ed44bf0c11ecd2e053f..e8d5bbada091b3c5fbe84e81c14a096a5e0d9b1c 100644
--- a/test/built-ins/parseInt/S15.1.2.2_A9.2.js
+++ b/test/built-ins/parseInt/S15.1.2.2_A9.2.js
@@ -5,12 +5,11 @@
 info: The length property of parseInt does not have the attribute DontDelete
 es5id: 15.1.2.2_A9.2
 description: Checking use hasOwnProperty, delete
-includes: [$FAIL.js]
 ---*/
 
 //CHECK#1
 if (parseInt.hasOwnProperty('length') !== true) {
-  $FAIL('#1: parseInt.hasOwnProperty(\'length\') === true. Actual: ' + (parseInt.hasOwnProperty('length')));
+  $ERROR('#1: parseInt.hasOwnProperty(\'length\') === true. Actual: ' + (parseInt.hasOwnProperty('length')));
 }
 
 delete parseInt.length;
diff --git a/test/language/expressions/instanceof/S15.3.5.3_A2_T2.js b/test/language/expressions/instanceof/S15.3.5.3_A2_T2.js
index bd99332602488a767ea8d36ec1282655132f5dae..354fd0b90746bf776463e11b925cb5636e8b609d 100644
--- a/test/language/expressions/instanceof/S15.3.5.3_A2_T2.js
+++ b/test/language/expressions/instanceof/S15.3.5.3_A2_T2.js
@@ -9,7 +9,6 @@ info: >
     iii) O is not an object, throw a TypeError exception
 es5id: 15.3.5.3_A2_T2
 description: F.prototype is undefined, and V is empty object
-includes: [$FAIL.js]
 ---*/
 
 var FACTORY;
@@ -23,7 +22,7 @@ obj={};
 //CHECK#1
 try {
   obj instanceof  FACTORY;
-  $FAIL('#1: O is not an object, throw a TypeError exception');
+  $ERROR('#1: O is not an object, throw a TypeError exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
   	$ERROR('#1.1: O is not an object, throw a TypeError exception');
diff --git a/test/language/expressions/instanceof/S15.3.5.3_A2_T5.js b/test/language/expressions/instanceof/S15.3.5.3_A2_T5.js
index a615e68e5fb24415e555cf82bdd74ad958846384..afb08477abe7392999e765506f9f0de24f042da7 100644
--- a/test/language/expressions/instanceof/S15.3.5.3_A2_T5.js
+++ b/test/language/expressions/instanceof/S15.3.5.3_A2_T5.js
@@ -10,7 +10,6 @@ info: >
     throw a TypeError exception
 es5id: 15.3.5.3_A2_T5
 description: F.prototype is void 0, and V is new F
-includes: [$FAIL.js]
 ---*/
 
 var FACTORY;
@@ -26,7 +25,7 @@ FACTORY.prototype = void 0;
 // CHECK#1
 try {
   instance instanceof FACTORY;
-  $FAIL('#1: O is not an object, throw a TypeError exception');
+  $ERROR('#1: O is not an object, throw a TypeError exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: O is not an object, throw a TypeError exception');
diff --git a/test/language/expressions/instanceof/S15.3.5.3_A2_T6.js b/test/language/expressions/instanceof/S15.3.5.3_A2_T6.js
index 7330927599e082c1b0e3b337765f74c7f5a0b42d..955655daaede6d174b095f6492463c1975636d35 100644
--- a/test/language/expressions/instanceof/S15.3.5.3_A2_T6.js
+++ b/test/language/expressions/instanceof/S15.3.5.3_A2_T6.js
@@ -10,7 +10,6 @@ info: >
     throw a TypeError exception
 es5id: 15.3.5.3_A2_T6
 description: F.prototype is string, and V is function
-includes: [$FAIL.js]
 ---*/
 
 var FACTORY;
@@ -22,7 +21,7 @@ FACTORY.prototype = "error";
 try {
   ( function() {
   }) instanceof FACTORY;
-  $FAIL('#1: O is not an object, throw a TypeError exception');
+  $ERROR('#1: O is not an object, throw a TypeError exception');
 } catch (e) {
   if (!(e instanceof TypeError)) {
     $ERROR('#1.1: O is not an object, throw a TypeError exception');
diff --git a/test/language/statements/function/S13.2.2_A1_T2.js b/test/language/statements/function/S13.2.2_A1_T2.js
index b0cc1ebf0c6854236fc57c6c2ed287e82cf7a0fb..e017d88b1327d83a6c4f26ce53ba8c4965aadb15 100644
--- a/test/language/statements/function/S13.2.2_A1_T2.js
+++ b/test/language/statements/function/S13.2.2_A1_T2.js
@@ -7,7 +7,6 @@ info: >
     of a new created object through [[Construct]] property
 es5id: 13.2.2_A1_T2
 description: Declaring a function with "var __PROTO = function()"
-includes: [$FAIL.js]
 ---*/
 
 var __MONSTER="monster";
@@ -19,7 +18,7 @@ try{
     __PROTO.type=__MONSTER;
 }
 catch(e){
-    $FAIL('#0: __PROTO.type=__MONSTER does not lead to throwing exception')
+    $ERROR('#0: __PROTO.type=__MONSTER does not lead to throwing exception')
 }
 
 var __FACTORY = function(){};
diff --git a/test/language/statements/function/S13_A17_T1.js b/test/language/statements/function/S13_A17_T1.js
index 20cad1d2e0037736a8a8d2e036c6079d2b0a8555..353afaea9e71812ac6494ced5c86080a2af251f3 100644
--- a/test/language/statements/function/S13_A17_T1.js
+++ b/test/language/statements/function/S13_A17_T1.js
@@ -7,14 +7,13 @@ info: >
     appears
 es5id: 13_A17_T1
 description: Trying to call a function before the FunctionExpression appears
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 try{
     var __result = __func();
-	$FAIL("#1.1: var __result = __func() lead to throwing exception");
+	$ERROR("#1.1: var __result = __func() lead to throwing exception");
 } catch(e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.2: func should throw a TypeError  Actual: ' + (e));  
diff --git a/test/language/statements/function/S13_A6_T2.js b/test/language/statements/function/S13_A6_T2.js
index c6e0092f716f7fe9a1b5bbd8887729bcacc50095..a5cddc0d9cd5fb2001fc013cf1e3a36a8ab41536 100644
--- a/test/language/statements/function/S13_A6_T2.js
+++ b/test/language/statements/function/S13_A6_T2.js
@@ -7,7 +7,6 @@ info: >
     the same Identifier
 es5id: 13_A6_T2
 description: Calling a function before it is declared one more time
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
@@ -15,7 +14,7 @@ includes: [$FAIL.js]
 try{
     var __result = __func();
 } catch(e) {
-    $FAIL("#1: Function call can appears in the program before the FunctionDeclaration appears");
+    $ERROR("#1: Function call can appears in the program before the FunctionDeclaration appears");
 }
 if (__result !== "SECOND") {
 	$ERROR('#1.1: __result === "SECOND". Actual: __result ==='+__result);
diff --git a/test/language/statements/if/S12.5_A4.js b/test/language/statements/if/S12.5_A4.js
index 0b359d4773e38f2d1878c23c90aa689551141cbe..3a7ed128a326729d3236e28cca72e3c6a56d9c8f 100644
--- a/test/language/statements/if/S12.5_A4.js
+++ b/test/language/statements/if/S12.5_A4.js
@@ -7,14 +7,13 @@ info: >
     Statement" is evaluated, Statement(s) is(are) evaluated second
 es5id: 12.5_A4
 description: The first statement is "(function(){throw "instatement"})()"
-includes: [$FAIL.js]
 ---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 try {
 	if (true) (function(){throw "instatement"})();
-	$FAIL("#1 failed")
+	$ERROR("#1 failed")
 } catch (e) {
 	if (e !== "instatement") {
 		$ERROR('#1: Exception === "instatement". Actual:  Exception ==='+ e);
@@ -27,7 +26,7 @@ try {
 //CHECK#2
 try {
 	if (false) (function(){throw "truebranch"})(); (function(){throw "missbranch"})();
-	$FAIL("#2 failed")
+	$ERROR("#2 failed")
 } catch (e) {
 	if (e !== "missbranch") {
 		$ERROR('#2: Exception === "missbranch". Actual:  Exception ==='+ e);